diff --git a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/tool/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/tool/BUILD.gn
index 6bdae018884f1..6fbe7d94ddae4 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/pseudo/tool/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/pseudo/tool/BUILD.gn
@@ -1,8 +1,8 @@
 executable("clang-pseudo") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
-    "//clang/lib/Basic",
     "//clang-tools-extra/pseudo/lib",
+    "//clang/lib/Basic",
     "//llvm/lib/Support",
   ]
   include_dirs = [ "../include" ]
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
index e71136aba6d61..6ae3d632a2897 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
@@ -6,8 +6,8 @@ unittest("ClangTidyTests") {
     "//clang-tools-extra/clang-tidy",
     "//clang-tools-extra/clang-tidy/android",
     "//clang-tools-extra/clang-tidy/google",
-    "//clang-tools-extra/clang-tidy/modernize",
     "//clang-tools-extra/clang-tidy/llvm",
+    "//clang-tools-extra/clang-tidy/modernize",
     "//clang-tools-extra/clang-tidy/objc",
     "//clang-tools-extra/clang-tidy/readability",
     "//clang-tools-extra/clang-tidy/utils",
diff --git a/llvm/utils/gn/secondary/clang/tools/clang-offload-packager/BUILD.gn b/llvm/utils/gn/secondary/clang/tools/clang-offload-packager/BUILD.gn
index 82051a43b87ee..b33b534fde46b 100644
--- a/llvm/utils/gn/secondary/clang/tools/clang-offload-packager/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/tools/clang-offload-packager/BUILD.gn
@@ -2,9 +2,9 @@ executable("clang-offload-packager") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
     "//clang/lib/Basic",
-    "//llvm/lib/Target:TargetsToBuild",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
+    "//llvm/lib/Target:TargetsToBuild",
   ]
   sources = [ "ClangOffloadPackager.cpp" ]
 }
diff --git a/llvm/utils/gn/secondary/compiler-rt/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
index 05053e770e0d5..edadd265833b9 100644
--- a/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
@@ -13,7 +13,8 @@ if (current_os == "win") {
 }
 supported_toolchains += supported_android_toolchains
 if (llvm_build_AArch64) {
-  supported_toolchains += [ "//llvm/utils/gn/build/toolchain:stage2_baremetal_aarch64" ]
+  supported_toolchains +=
+      [ "//llvm/utils/gn/build/toolchain:stage2_baremetal_aarch64" ]
 }
 group("compiler-rt") {
   deps = [ "//compiler-rt/include($host_toolchain)" ]
diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
index 39154c25f6729..0248511dfb8a0 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
@@ -435,9 +435,9 @@ static_library("builtins") {
 
   if (current_cpu == "avr") {
     sources += [
-      "avr/exit.S",
       "avr/divmodhi4.S",
       "avr/divmodqi4.S",
+      "avr/exit.S",
       "avr/mulhi3.S",
       "avr/mulqi3.S",
       "avr/udivmodhi4.S",
diff --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn
index 569880a3c3d8d..585ef0449d0e4 100644
--- a/llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -14,8 +14,7 @@ write_cmake_config("lit_site_cfg") {
 
   values = [
     "LIT_SITE_CFG_IN_HEADER=## Autogenerated from $input, do not edit",
-    "LLD_BINARY_DIR=" +
-        rebase_path(get_label_info("//lld", "target_out_dir")),
+    "LLD_BINARY_DIR=" + rebase_path(get_label_info("//lld", "target_out_dir")),
     "CURRENT_LIBS_DIR=",  # FIXME: for shared builds only (?)
     "CURRENT_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
     "LLD_SOURCE_DIR=" + rebase_path("//lld"),
diff --git a/llvm/utils/gn/secondary/lldb/source/Plugins/Platform/gdb-server/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/Platform/gdb-server/BUILD.gn
index c1f99e94b47ec..bcd800a17d24f 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/Platform/gdb-server/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/Platform/gdb-server/BUILD.gn
@@ -9,6 +9,7 @@ static_library("gdb-server") {
     "//lldb/source/Core",
     "//lldb/source/Host",
     "//lldb/source/Plugins/Process/Utility",
+
     #"//lldb/source/Plugins/Process/gdb-remote",  # 4-deep dependency cycle
     "//lldb/source/Target",
   ]
diff --git a/llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn
index 01a85ba249e55..ae28e967ad149 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Support/BLAKE3/BUILD.gn
@@ -6,11 +6,11 @@ static_library("BLAKE3") {
     "blake3_portable.c",
   ]
   defines = [
-   "BLAKE3_NO_AVX512",
-   "BLAKE3_NO_AVX2",
-   "BLAKE3_NO_SSE41",
-   "BLAKE3_NO_SSE2",
-   "BLAKE3_USE_NEON=0",
+    "BLAKE3_NO_AVX512",
+    "BLAKE3_NO_AVX2",
+    "BLAKE3_NO_SSE41",
+    "BLAKE3_NO_SSE2",
+    "BLAKE3_USE_NEON=0",
   ]
 }
 
diff --git a/llvm/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn
index 412557df6015f..09bf4d391eb13 100644
--- a/llvm/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/TableGen/BUILD.gn
@@ -27,9 +27,9 @@ executable("llvm-tblgen") {
     "DAGISelMatcherEmitter.cpp",
     "DAGISelMatcherGen.cpp",
     "DAGISelMatcherOpt.cpp",
-    "DecoderEmitter.cpp",
     "DFAEmitter.cpp",
     "DFAPacketizerEmitter.cpp",
+    "DecoderEmitter.cpp",
     "DirectiveEmitter.cpp",
     "DisassemblerEmitter.cpp",
     "ExegesisEmitter.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
index b317b969312b1..819f6c91d0270 100644
--- a/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
@@ -21,12 +21,12 @@ write_cmake_config("llvm-lit") {
   deps = [ "//llvm/tools/llvm-config" ]
 
   deps += [
-    "//clang-tools-extra/test:lit_site_cfg",
-    "//clang-tools-extra/test:lit_unit_site_cfg",
     "//clang-tools-extra/clangd/test:lit_site_cfg",
     "//clang-tools-extra/clangd/test:lit_unit_site_cfg",
     "//clang-tools-extra/pseudo/test:lit_site_cfg",
     "//clang-tools-extra/pseudo/test:lit_unit_site_cfg",
+    "//clang-tools-extra/test:lit_site_cfg",
+    "//clang-tools-extra/test:lit_unit_site_cfg",
     "//clang/test:lit_site_cfg",
     "//clang/test:lit_unit_site_cfg",
     "//lld/test:lit_site_cfg",