[llvm] 877073b - [gn build] (manually) merge 47edf5bafb

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-03-10T10:22:39-04:00
New Revision: 877073bc1c46d6ee8291516c9a26dbe400c1d24e

URL: https://github.com/llvm/llvm-project/commit/877073bc1c46d6ee8291516c9a26dbe400c1d24e
DIFF: https://github.com/llvm/llvm-project/commit/877073bc1c46d6ee8291516c9a26dbe400c1d24e.diff

LOG: [gn build] (manually) merge 47edf5bafb

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/lib/Headers/BUILD.gn
    llvm/utils/gn/secondary/clang/lib/Sema/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 7f566246ea1c..1a96d603de47 100644
--- a/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/include/clang/Basic/BUILD.gn
@@ -89,7 +89,7 @@ clang_tablegen("AttrHasAttributeImpl") {
   td_file = "Attr.td"
 }
 
-# ARM NEON and MVE
+# ARM CDE, MVE, and NEON.
 
 clang_tablegen("arm_neon") {
   args = [ "-gen-arm-neon-sema" ]
@@ -118,3 +118,23 @@ clang_tablegen("arm_mve_builtin_aliases") {
   args = [ "-gen-arm-mve-builtin-aliases" ]
   td_file = "arm_mve.td"
 }
+
+clang_tablegen("arm_cde_builtins") {
+  args = [ "-gen-arm-cde-builtin-def" ]
+  td_file = "arm_cde.td"
+}
+
+clang_tablegen("arm_cde_builtin_cg") {
+  args = [ "-gen-arm-cde-builtin-codegen" ]
+  td_file = "arm_cde.td"
+}
+
+clang_tablegen("arm_cde_builtin_sema") {
+  args = [ "-gen-arm-cde-builtin-sema" ]
+  td_file = "arm_cde.td"
+}
+
+clang_tablegen("arm_cde_builtin_aliases") {
+  args = [ "-gen-arm-cde-builtin-aliases" ]
+  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 6105fd4e2bfb..c505a698052a 100644
--- a/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Basic/BUILD.gn
@@ -24,6 +24,7 @@ static_library("Basic") {
     "//clang/include/clang/Basic:AttrList",
     "//clang/include/clang/Basic:AttrSubMatchRulesList",
     "//clang/include/clang/Basic:DiagnosticGroups",
+    "//clang/include/clang/Basic:arm_cde_builtins",
     "//clang/include/clang/Basic:arm_mve_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 3832313c4c59..f4e275b25305 100644
--- a/llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/CodeGen/BUILD.gn
@@ -2,6 +2,7 @@ static_library("CodeGen") {
   output_name = "clangCodeGen"
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
+    "//clang/include/clang/Basic:arm_cde_builtin_cg",
     "//clang/include/clang/Basic:arm_mve_builtin_cg",
     "//clang/lib/AST",
     "//clang/lib/Analysis",

diff  --git a/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
index d785bfca0f0f..e46a29227d19 100644
--- a/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Headers/BUILD.gn
@@ -22,15 +22,23 @@ clang_tablegen("arm_mve") {
   output_name = "arm_mve.h"
 }
 
+# Generate arm_cde.h
+clang_tablegen("arm_cde") {
+  args = [ "-gen-arm-cde-header" ]
+  td_file = "//clang/include/clang/Basic/arm_cde.td"
+  output_name = "arm_cde.h"
+}
+
 copy("arm_headers") {
   visibility = [ ":Headers" ]
   deps = [
+    ":arm_cde",
     ":arm_fp16",
     ":arm_mve",
     ":arm_neon",
   ]
   sources = get_target_outputs(":arm_neon") + get_target_outputs(":arm_fp16") +
-            get_target_outputs(":arm_mve")
+            get_target_outputs(":arm_mve")  + get_target_outputs(":arm_cde")
   outputs = [ "$clang_resource_dir/include/{{source_file_part}}" ]
 }
 

diff  --git a/llvm/utils/gn/secondary/clang/lib/Sema/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Sema/BUILD.gn
index 4d419cdc898f..bc6833e48b5a 100644
--- a/llvm/utils/gn/secondary/clang/lib/Sema/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Sema/BUILD.gn
@@ -9,6 +9,8 @@ static_library("Sema") {
   configs += [ "//llvm/utils/gn/build:clang_code" ]
   deps = [
     ":OpenCLBuiltins",
+    "//clang/include/clang/Basic:arm_cde_builtin_aliases",
+    "//clang/include/clang/Basic:arm_cde_builtin_sema",
     "//clang/include/clang/Basic:arm_mve_builtin_aliases",
     "//clang/include/clang/Basic:arm_mve_builtin_sema",
     "//clang/include/clang/Sema:AttrParsedAttrImpl",