diff --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
index 813f39ddb623..195f526da6b8 100644
--- a/llvm/utils/gn/build/BUILD.gn
+++ b/llvm/utils/gn/build/BUILD.gn
@@ -90,7 +90,6 @@ config("compiler_defaults") {
       }
     } else if (symbol_level == 1) {
       cflags += [ "-g1" ]
-
       # For linetable-only -g1 builds, --gdb-index makes links ~8% slower, but
       # links are 4x faster than -g builds so it's a fairly small absolute cost.
       # On the other hand, gdb startup is well below 1s with and without the
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 4f0738292b2c..6e799b91eeaf 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
@@ -429,8 +429,8 @@ static_library("builtins") {
   if (current_cpu == "arm64") {
     sources -= [ "fp_mode.c" ]
     sources += [
-      "cpu_model.c",
       "aarch64/fp_mode.c",
+      "cpu_model.c",
     ]
     if (current_os == "mingw") {
       sources += [ "aarch64/chkstk.S" ]
diff --git a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
index 5ad30ebeabd1..864aa375ca45 100644
--- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -60,7 +60,7 @@ action("concat_config") {
     rebase_path("$target_gen_dir/__config_site", root_build_dir),
     rebase_path("__config", root_build_dir),
     "-o",
-    rebase_path(outputs[0], root_build_dir)
+    rebase_path(outputs[0], root_build_dir),
   ]
   deps = [ ":write_config" ]
 }
@@ -90,6 +90,25 @@ copy("include") {
     "__sso_allocator",
     "__std_stream",
     "__string",
+    "__support/android/locale_bionic.h",
+    "__support/fuchsia/xlocale.h",
+    "__support/ibm/limits.h",
+    "__support/ibm/locale_mgmt_aix.h",
+    "__support/ibm/nanosleep.h",
+    "__support/ibm/support.h",
+    "__support/ibm/xlocale.h",
+    "__support/musl/xlocale.h",
+    "__support/newlib/xlocale.h",
+    "__support/nuttx/xlocale.h",
+    "__support/openbsd/xlocale.h",
+    "__support/solaris/floatingpoint.h",
+    "__support/solaris/wchar.h",
+    "__support/solaris/xlocale.h",
+    "__support/win32/limits_msvc_win32.h",
+    "__support/win32/locale_win32.h",
+    "__support/xlocale/__nop_locale_mgmt.h",
+    "__support/xlocale/__posix_l_fallback.h",
+    "__support/xlocale/__strtonum_fallback.h",
     "__threading_support",
     "__tree",
     "__tuple",
@@ -218,25 +237,6 @@ copy("include") {
     "string.h",
     "string_view",
     "strstream",
-    "__support/android/locale_bionic.h",
-    "__support/fuchsia/xlocale.h",
-    "__support/ibm/limits.h",
-    "__support/ibm/locale_mgmt_aix.h",
-    "__support/ibm/nanosleep.h",
-    "__support/ibm/support.h",
-    "__support/ibm/xlocale.h",
-    "__support/musl/xlocale.h",
-    "__support/newlib/xlocale.h",
-    "__support/nuttx/xlocale.h",
-    "__support/openbsd/xlocale.h",
-    "__support/solaris/floatingpoint.h",
-    "__support/solaris/wchar.h",
-    "__support/solaris/xlocale.h",
-    "__support/win32/limits_msvc_win32.h",
-    "__support/win32/locale_win32.h",
-    "__support/xlocale/__nop_locale_mgmt.h",
-    "__support/xlocale/__posix_l_fallback.h",
-    "__support/xlocale/__strtonum_fallback.h",
     "system_error",
     "tgmath.h",
     "thread",
diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Frontend/OpenMP/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Frontend/OpenMP/BUILD.gn
index bb1c8803d9ca..04bfdd6f3134 100644
--- a/llvm/utils/gn/secondary/llvm/include/llvm/Frontend/OpenMP/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/include/llvm/Frontend/OpenMP/BUILD.gn
@@ -19,7 +19,7 @@ tablegen("OMP") {
 group("public_tablegen") {
   public_deps = [
     # Frontend/OpenMP's public headers include OMP.h.inc.
-    ":OMPh",
     ":OMP",
+    ":OMPh",
   ]
 }
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/MCTargetDesc/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/MCTargetDesc/BUILD.gn
index 47d526840fe0..a6006841a470 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/MCTargetDesc/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/RISCV/MCTargetDesc/BUILD.gn
@@ -40,9 +40,7 @@ tablegen("RISCVGenSubtargetInfo") {
 # by other targets. .inc files only used by .cpp files in this directory
 # should be in deps on the static_library instead.
 group("tablegen") {
-  visibility = [
-    ":MCTargetDesc",
-  ]
+  visibility = [ ":MCTargetDesc" ]
   public_deps = [
     ":RISCVGenInstrInfo",
     ":RISCVGenRegisterInfo",
diff --git a/llvm/utils/gn/secondary/llvm/lib/Transforms/Scalar/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Transforms/Scalar/BUILD.gn
index 3842ab2fa8f3..2fca3d3eee77 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Transforms/Scalar/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Transforms/Scalar/BUILD.gn
@@ -76,8 +76,8 @@ static_library("Scalar") {
     "SCCP.cpp",
     "SROA.cpp",
     "Scalar.cpp",
-    "Scalarizer.cpp",
     "ScalarizeMaskedMemIntrin.cpp",
+    "Scalarizer.cpp",
     "SeparateConstOffsetFromGEP.cpp",
     "SimpleLoopUnswitch.cpp",
     "SimplifyCFGPass.cpp",