Revert "[gn build] (manually) port 8b409eaba"

This reverts commit 85462aefb527eaa4a6a7563f9341ceab283cdf1f
and follow-up 8d6582aa6bbd952744abd1f3cb74065f96535169.

8b409eaba was reverted.

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 06e8644..1a96d60 100644 (file)
--- a/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
@@ -119,16 +119,6 @@ clang_tablegen("arm_mve_builtin_aliases") {
   td_file = "arm_mve.td"
 }
 
-clang_tablegen("arm_sve_builtins") {
-  args = [ "-gen-arm-sve-builtins" ]
-  td_file = "arm_sve.td"
-}
-
-clang_tablegen("arm_sve_codegenmap") {
-  args = [ "-gen-arm-sve-codegenmap" ]
-  td_file = "arm_sve.td"
-}
-
 clang_tablegen("arm_cde_builtins") {
   args = [ "-gen-arm-cde-builtin-def" ]
   td_file = "arm_cde.td"

diff --git a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
index 7267286..c505a69 100644 (file)
--- a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
@@ -26,7 +26,6 @@ static_library("Basic") {
     "//clang/include/clang/Basic:DiagnosticGroups",
     "//clang/include/clang/Basic:arm_cde_builtins",
     "//clang/include/clang/Basic:arm_mve_builtins",
-    "//clang/include/clang/Basic:arm_sve_builtins",
     "//clang/include/clang/Basic:diags_tablegen",
     "//clang/include/clang/Basic:version",
   ]

diff --git a/llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
index c9097d5..f4e275b 100644 (file)
--- a/llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
@@ -4,7 +4,6 @@ static_library("CodeGen") {
   deps = [
     "//clang/include/clang/Basic:arm_cde_builtin_cg",
     "//clang/include/clang/Basic:arm_mve_builtin_cg",
-    "//clang/include/clang/Basic:arm_sve_codegenmap",
     "//clang/lib/AST",
     "//clang/lib/Analysis",
     "//clang/lib/Basic",

diff --git a/llvm/utils/gn/secondary/clang/utils/TableGen/BUILD.gn b/llvm/utils/gn/secondary/clang/utils/TableGen/BUILD.gn
index 34297ec..a0e35cc 100644 (file)
--- a/llvm/utils/gn/secondary/clang/utils/TableGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/utils/TableGen/BUILD.gn
@@ -3,11 +3,6 @@ executable("clang-tblgen") {
     "//llvm/lib/Support",
     "//llvm/lib/TableGen",
   ]
-
-  # FIXME: This is incorrect, see https://reviews.llvm.org/D75470#inline-695187
-  # Remoe again once that's rectified.
-  include_dirs = [ "//clang/include" ]
-
   sources = [
     "ASTTableGen.cpp",
     "ClangASTNodesEmitter.cpp",