diff --git a/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn b/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
index 447fbf82586f..2ede8a5cf293 100644
--- a/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
@@ -159,7 +159,15 @@ clang_tablegen("BuiltinsRISCV") {
   args = [ "-gen-clang-builtins" ]
 }
 
-clang_tablegen("BuiltinsSPIRV") {
+clang_tablegen("BuiltinsSPIRVCommon") {
+  args = [ "-gen-clang-builtins" ]
+}
+
+clang_tablegen("BuiltinsSPIRVVK") {
+  args = [ "-gen-clang-builtins" ]
+}
+
+clang_tablegen("BuiltinsSPIRVCL") {
   args = [ "-gen-clang-builtins" ]
 }
 
diff --git a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
index 46986b4ab03b..e24429a9167b 100644
--- a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
@@ -31,7 +31,9 @@ static_library("Basic") {
     "//clang/include/clang/Basic:BuiltinsHexagon",
     "//clang/include/clang/Basic:BuiltinsNVPTX",
     "//clang/include/clang/Basic:BuiltinsRISCV",
-    "//clang/include/clang/Basic:BuiltinsSPIRV",
+    "//clang/include/clang/Basic:BuiltinsSPIRVCL",
+    "//clang/include/clang/Basic:BuiltinsSPIRVCommon",
+    "//clang/include/clang/Basic:BuiltinsSPIRVVK",
     "//clang/include/clang/Basic:BuiltinsX86",
     "//clang/include/clang/Basic:BuiltinsX86_64",
     "//clang/include/clang/Basic:DiagnosticGroups",
diff --git a/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
index 951cf56dca6d..0220ced1f63a 100644
--- a/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
@@ -103,6 +103,7 @@ copy("Headers") {
     "__clang_hip_math.h",
     "__clang_hip_runtime_wrapper.h",
     "__clang_hip_stdlib.h",
+    "__clang_spirv_builtins.h",
     "__stdarg___gnuc_va_list.h",
     "__stdarg___va_copy.h",
     "__stdarg_header_macro.h",