diff --git a/llvm/utils/gn/secondary/clang/lib/Interpreter/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Interpreter/BUILD.gn
index da142feb6af8..8f686f290750 100644
--- a/llvm/utils/gn/secondary/clang/lib/Interpreter/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Interpreter/BUILD.gn
@@ -5,6 +5,7 @@ static_library("Interpreter") {
     "//clang/lib/AST",
     "//clang/lib/Analysis",
     "//clang/lib/Basic",
+    "//clang/lib/CodeGen",
     "//clang/lib/Driver",
     "//clang/lib/Edit",
     "//clang/lib/Frontend",
@@ -13,13 +14,12 @@ static_library("Interpreter") {
     "//clang/lib/Parse",
     "//clang/lib/Sema",
     "//clang/lib/Serialization",
-    "//clang/lib/CodeGen",
+    "//llvm/lib/ExecutionEngine/Orc",
     "//llvm/lib/IR",
     "//llvm/lib/Option",
     "//llvm/lib/Support",
     "//llvm/lib/Target",
     "//llvm/lib/Target:NativeTarget",
-    "//llvm/lib/ExecutionEngine/Orc",
   ]
   sources = [
     "IncrementalExecutor.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
index be4b8ce8360a..876d05102382 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
@@ -111,7 +111,6 @@ static_library("LLVMX86CodeGen") {
     "X86LoadValueInjectionRetHardening.cpp",
     "X86LowerAMXIntrinsics.cpp",
     "X86LowerAMXType.cpp",
-    "X86PreAMXConfig.cpp",
     "X86LowerTileCopy.cpp",
     "X86MCInstLower.cpp",
     "X86MachineFunctionInfo.cpp",
@@ -119,6 +118,7 @@ static_library("LLVMX86CodeGen") {
     "X86OptimizeLEAs.cpp",
     "X86PadShortFunction.cpp",
     "X86PartialReduction.cpp",
+    "X86PreAMXConfig.cpp",
     "X86PreTileConfig.cpp",
     "X86RegisterBankInfo.cpp",
     "X86RegisterInfo.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
index 9b9e0e5bd528..ccdb401a4b83 100644
--- a/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/unittest/BUILD.gn
@@ -9,9 +9,7 @@ config("googletest_config") {
 
   # LLVM requires C++11 but gtest doesn't correctly detect the availability
   # of C++11 on MSVC, so we force it on.
-  defines = [
-    "GTEST_LANG_CXX11",
-  ]
+  defines = [ "GTEST_LANG_CXX11" ]
   if (host_os == "win") {
     defines += [ "GTEST_OS_WINDOWS" ]
   }