diff --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
index e705fe81652e25..8c28c15a668052 100644
--- a/llvm/utils/gn/build/BUILD.gn
+++ b/llvm/utils/gn/build/BUILD.gn
@@ -370,7 +370,8 @@ config("no_rtti") {
 config("zdefs") {
   # -Wl,-z,defs doesn't work with sanitizers.
   # https://clang.llvm.org/docs/AddressSanitizer.html
-  if (current_os != "ios" && current_os != "mac" && current_os != "win" && !(use_asan || use_tsan || use_ubsan)) {
+  if (current_os != "ios" && current_os != "mac" && current_os != "win" &&
+      !(use_asan || use_tsan || use_ubsan)) {
     ldflags = [ "-Wl,-z,defs" ]
   }
 }
diff --git a/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
index 5b0173badd6586..ea52221b73dd89 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Interpreter/ExceptionTests/BUILD.gn
@@ -9,10 +9,10 @@ unittest("ClangReplInterpreterExceptionTests") {
   deps = [
     "//clang/lib/AST",
     "//clang/lib/Basic",
-    "//clang/lib/Interpreter",
     "//clang/lib/Frontend",
-    "//llvm/lib/IR",
+    "//clang/lib/Interpreter",
     "//llvm/lib/ExecutionEngine/Orc",
+    "//llvm/lib/IR",
     "//llvm/lib/Support",
     "//llvm/lib/Target:TargetsToBuild",
   ]
diff --git a/llvm/utils/gn/secondary/compiler-rt/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
index 7a0f40be3f9251..a234a3ce1f8471 100644
--- a/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
@@ -18,9 +18,7 @@ if (android_ndk_path != "") {
   ]
 }
 group("compiler-rt") {
-  deps = [
-    "//compiler-rt/include($host_toolchain)",
-  ]
+  deps = [ "//compiler-rt/include($host_toolchain)" ]
   foreach(toolchain, supported_toolchains) {
     deps += [ "//compiler-rt/lib($toolchain)" ]
   }
diff --git a/llvm/utils/gn/secondary/lld/COFF/BUILD.gn b/llvm/utils/gn/secondary/lld/COFF/BUILD.gn
index 78c79844bb2a75..8c1e6ca36273d4 100644
--- a/llvm/utils/gn/secondary/lld/COFF/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/COFF/BUILD.gn
@@ -27,9 +27,9 @@ static_library("COFF") {
     "//llvm/lib/WindowsManifest",
   ]
   sources = [
+    "COFFLinkerContext.cpp",
     "CallGraphSort.cpp",
     "Chunks.cpp",
-    "COFFLinkerContext.cpp",
     "DLL.cpp",
     "DebugTypes.cpp",
     "Driver.cpp",
diff --git a/llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn b/llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn
index f51980c1ca8720..e74cbab85d701c 100644
--- a/llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn
@@ -52,7 +52,7 @@ write_cmake_config("Config") {
       "LLDB_ENABLE_TERMIOS=1",
     ]
   }
-  
+
   if (current_os == "win" || current_os == "linux" || current_os == "android") {
     values += [ "HAVE_SYS_EVENT_H=" ]
   } else {
diff --git a/llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn
index 9ec2a2e9143791..8de3a6c0bb8d89 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn
@@ -215,7 +215,8 @@ write_cmake_config("Plugins.def") {
   # These are in separate variables to make sure ProcessWindowsCommon is
   # initalized after all plugins, but before ProcessGDBRemote.
   if (current_os == "win") {
-    values += [ "LLDB_PROCESS_WINDOWS_PLUGIN=LLDB_PLUGIN(ProcessWindowsCommon)" ]
+    values +=
+        [ "LLDB_PROCESS_WINDOWS_PLUGIN=LLDB_PLUGIN(ProcessWindowsCommon)" ]
   } else {
     values += [ "LLDB_PROCESS_WINDOWS_PLUGIN=" ]
   }
diff --git a/llvm/utils/gn/secondary/lldb/source/Plugins/ObjectFile/JIT/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/ObjectFile/JIT/BUILD.gn
index 735d15d82dc1a8..b031967e7d62e6 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/ObjectFile/JIT/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/ObjectFile/JIT/BUILD.gn
@@ -9,6 +9,7 @@ static_library("JIT") {
     #"//lldb/source/Target", # 2-hop dependency cycle.
     "//llvm/lib/Support",
   ]
+
   # For Utility/UuidCompatibility.h.
   include_dirs = [ "//lldb/source" ]
   sources = [ "ObjectFileJIT.cpp" ]
diff --git a/llvm/utils/gn/secondary/lldb/source/Plugins/Platform/Linux/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/Platform/Linux/BUILD.gn
index a115e58453e1bc..2d65a06fdc445a 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/Platform/Linux/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/Platform/Linux/BUILD.gn
@@ -9,9 +9,10 @@ static_library("Linux") {
     "//lldb/source/Core",
     "//lldb/source/Host",
     "//lldb/source/Interpreter",
-    "//lldb/source/Target",
     "//lldb/source/Plugins/Platform/POSIX",
+    "//lldb/source/Target",
   ]
+
   # Reaches into Plugins/Platform/POSIX.
   include_dirs = [ "//lldb/source" ]
   sources = [ "PlatformLinux.cpp" ]
diff --git a/llvm/utils/gn/secondary/lldb/source/Plugins/Process/Linux/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/Process/Linux/BUILD.gn
index c80449916f8da1..8ad09074646c3e 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/Process/Linux/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/Process/Linux/BUILD.gn
@@ -4,13 +4,14 @@ static_library("Linux") {
   deps = [
     "//lldb/source/Core",
     "//lldb/source/Host",
+    "//lldb/source/Plugins/Process/POSIX",
+    "//lldb/source/Plugins/Process/Utility",
     "//lldb/source/Symbol",
     "//lldb/source/Target",
     "//lldb/source/Utility",
-    "//lldb/source/Plugins/Process/POSIX",
-    "//lldb/source/Plugins/Process/Utility",
     "//llvm/lib/Support",
   ]
+
   # Uses source-relative includes for own headers.
   include_dirs = [ "//lldb/source" ]
   sources = [
@@ -26,4 +27,3 @@ static_library("Linux") {
     "SingleStepCheck.cpp",
   ]
 }
-
diff --git a/llvm/utils/gn/secondary/lldb/source/Plugins/Process/POSIX/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/Process/POSIX/BUILD.gn
index 2be26de4fae2cf..dad3128ce224ab 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/Process/POSIX/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/Process/POSIX/BUILD.gn
@@ -2,10 +2,11 @@ static_library("POSIX") {
   output_name = "lldbPluginProcessPOSIX"
   configs += [ "//llvm/utils/gn/build:lldb_code" ]
   deps = [
-    "//lldb/source/Utility",
     "//lldb/source/Plugins/Process/Utility",
+    "//lldb/source/Utility",
     "//llvm/lib/Support",
   ]
+
   # Reaches into Plugins/Platform/Process/Utility.
   include_dirs = [ "//lldb/source" ]
   sources = [
diff --git a/llvm/utils/gn/secondary/lldb/tools/driver/BUILD.gn b/llvm/utils/gn/secondary/lldb/tools/driver/BUILD.gn
index 9514ef229e01c9..7f69adc2cd7e0c 100644
--- a/llvm/utils/gn/secondary/lldb/tools/driver/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/tools/driver/BUILD.gn
@@ -43,7 +43,7 @@ executable("lldb") {
   if (current_os == "linux") {
     deps += [ "//lldb/tools/lldb-server" ]
   }
-  foreach (toolchain, supported_toolchains) {
+  foreach(toolchain, supported_toolchains) {
     deps += [ "//lldb/tools/lldb-server($toolchain)" ]
   }
 
diff --git a/llvm/utils/gn/secondary/lldb/tools/lldb-server/BUILD.gn b/llvm/utils/gn/secondary/lldb/tools/lldb-server/BUILD.gn
index 178fb05bdd3943..b5b3f65515d197 100644
--- a/llvm/utils/gn/secondary/lldb/tools/lldb-server/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/tools/lldb-server/BUILD.gn
@@ -18,8 +18,8 @@ executable("lldb-server") {
     "//lldb/source:lldbBase",
     "//lldb/source/Host",
     "//lldb/source/Initialization",
-
     "//lldb/source/Plugins/Instruction/ARM",
+
     #"//lldb/source/Plugins/Instruction/MIPS", # XXX
     #"//lldb/source/Plugins/Instruction/MIPS64", # XXX
     "//llvm/lib/Option",