[llvm] 9f981e9 - Reland "[gn build] (manually) port 8b409eaba"

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-03-18T11:31:18-04:00
New Revision: 9f981e9adf9c8d29bb80306daf08d2770263ade6

URL: https://github.com/llvm/llvm-project/commit/9f981e9adf9c8d29bb80306daf08d2770263ade6
DIFF: https://github.com/llvm/llvm-project/commit/9f981e9adf9c8d29bb80306daf08d2770263ade6.diff

LOG: Reland "[gn build] (manually) port 8b409eaba"

This reverts commit 4060016fce3e6a0b926ee9fc59e440a612d3a2ec
and re-merges c5b81466c.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
    llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
    llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
    llvm/utils/gn/secondary/clang/utils/TableGen/BUILD.gn

Removed: 
    


################################################################################
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 1a96d603de47..06e8644cb492 100644
--- a/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
@@ -119,6 +119,16 @@ 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 c505a698052a..7267286d4898 100644
--- a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
@@ -26,6 +26,7 @@ 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 f4e275b25305..c9097d5f2a51 100644
--- a/llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
@@ -4,6 +4,7 @@ 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 a0e35cc11ef6..34297ecf3b14 100644
--- a/llvm/utils/gn/secondary/clang/utils/TableGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/utils/TableGen/BUILD.gn
@@ -3,6 +3,11 @@ 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",