diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/performance/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/performance/BUILD.gn
index f39382e6738b..bce4bd3a9da5 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/performance/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/performance/BUILD.gn
@@ -34,5 +34,6 @@ static_library("performance") {
     "TypePromotionInMathFnCheck.cpp",
     "UnnecessaryCopyInitializationCheck.cpp",
     "UnnecessaryValueParamCheck.cpp",
+    "UseStdMoveCheck.cpp",
   ]
 }
diff --git a/llvm/utils/gn/secondary/clang/lib/Analysis/Scalable/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Analysis/Scalable/BUILD.gn
index b48c14da1571..bf1fabde2cc7 100644
--- a/llvm/utils/gn/secondary/clang/lib/Analysis/Scalable/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Analysis/Scalable/BUILD.gn
@@ -19,7 +19,11 @@ static_library("Scalable") {
     "Model/EntityLinkage.cpp",
     "Model/EntityName.cpp",
     "Model/SummaryName.cpp",
-    "Serialization/JSONFormat.cpp",
+    "Serialization/JSONFormat/JSONFormatImpl.cpp",
+    "Serialization/JSONFormat/LUSummary.cpp",
+    "Serialization/JSONFormat/LUSummaryEncoding.cpp",
+    "Serialization/JSONFormat/TUSummary.cpp",
+    "Serialization/JSONFormat/TUSummaryEncoding.cpp",
     "Serialization/SerializationFormatRegistry.cpp",
     "Support/ErrorBuilder.cpp",
     "TUSummary/ExtractorRegistry.cpp",
diff --git a/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
index 3087744f694c..4f3ab659737f 100644
--- a/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
@@ -130,6 +130,7 @@ copy("Headers") {
     "adxintrin.h",
     "altivec.h",
     "amdgpuintrin.h",
+    "amdhsa_abi.h",
     "ammintrin.h",
     "amo.h",
     "amxavx512intrin.h",
diff --git a/llvm/utils/gn/secondary/clang/unittests/Analysis/Scalable/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Analysis/Scalable/BUILD.gn
index 19b55e62c9f0..6c55ffd715bf 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Analysis/Scalable/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Analysis/Scalable/BUILD.gn
@@ -23,12 +23,15 @@ unittest("ClangScalableAnalysisTests") {
     "EntityLinkerTest.cpp",
     "EntityNameTest.cpp",
     "ErrorBuilderTest.cpp",
+    "ModelStringConversionsTest.cpp",
     "Registries/FancyAnalysisData.cpp",
     "Registries/MockSerializationFormat.cpp",
     "Registries/MockSummaryExtractor1.cpp",
     "Registries/MockSummaryExtractor2.cpp",
     "Registries/SerializationFormatRegistryTest.cpp",
     "Registries/SummaryExtractorRegistryTest.cpp",
+    "Serialization/JSONFormatTest/JSONFormatTest.cpp",
+    "Serialization/JSONFormatTest/LUSummaryTest.cpp",
     "Serialization/JSONFormatTest/TUSummaryTest.cpp",
     "SummaryNameTest.cpp",
     "TUSummaryBuilderTest.cpp",
diff --git a/llvm/utils/gn/secondary/clang/unittests/DependencyScanning/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/DependencyScanning/BUILD.gn
index 40986941429d..95c748a992ed 100644
--- a/llvm/utils/gn/secondary/clang/unittests/DependencyScanning/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/DependencyScanning/BUILD.gn
@@ -8,8 +8,5 @@ unittest("ClangDependencyScanningTests") {
     "//llvm/lib/Option",
     "//llvm/lib/Support",
   ]
-  sources = [
-    "DependencyScanningFilesystemTest.cpp",
-    "DependencyScanningWorkerTest.cpp",
-  ]
+  sources = [ "DependencyScanningFilesystemTest.cpp" ]
 }
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/BUILD.gn
index 4a223bf3dbbd..9b70db40acc1 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/NVPTX/BUILD.gn
@@ -55,6 +55,7 @@ static_library("LLVMNVPTXCodeGen") {
     "NVPTXLowerArgs.cpp",
     "NVPTXLowerUnreachable.cpp",
     "NVPTXMCExpr.cpp",
+    "NVPTXMarkKernelPtrsGlobal.cpp",
     "NVPTXPeephole.cpp",
     "NVPTXPrologEpilogPass.cpp",
     "NVPTXProxyRegErasure.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
index 12fa720a2efd..f597f8f2a243 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/AsmParser/BUILD.gn
@@ -1,15 +1,9 @@
 import("//llvm/utils/TableGen/tablegen.gni")
 
-tablegen("X86GenAsmMatcher") {
-  visibility = [ ":AsmParser" ]
-  args = [ "-gen-asm-matcher" ]
-  td_file = "../X86.td"
-}
-
 static_library("AsmParser") {
   output_name = "LLVMX86AsmParser"
   deps = [
-    ":X86GenAsmMatcher",
+    "..:X86GenAsmMatcher",
     "..:X86GenInstrMapping",
     "//llvm/lib/MC",
     "//llvm/lib/MC/MCParser",
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 5861eb739caf..640efc2dfabb 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
@@ -1,5 +1,14 @@
 import("//llvm/utils/TableGen/tablegen.gni")
 
+tablegen("X86GenAsmMatcher") {
+  visibility = [
+    ":LLVMX86CodeGen",
+    "AsmParser",
+  ]
+  args = [ "-gen-asm-matcher" ]
+  td_file = "X86.td"
+}
+
 tablegen("X86GenCallingConv") {
   visibility = [ ":LLVMX86CodeGen" ]
   args = [ "-gen-callingconv" ]
@@ -68,6 +77,7 @@ tablegen("X86GenPostLegalizeGICombiner") {
 
 static_library("LLVMX86CodeGen") {
   deps = [
+    ":X86GenAsmMatcher",
     ":X86GenCallingConv",
     ":X86GenDAGISel",
     ":X86GenFastISel",