[llvm] 8aa0a78 - gn build: (manually) merge d157a9bc

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2019-10-28T14:18:56-04:00
New Revision: 8aa0a785c423ebea84876b71f7b735bee96a0292

URL: https://github.com/llvm/llvm-project/commit/8aa0a785c423ebea84876b71f7b735bee96a0292
DIFF: https://github.com/llvm/llvm-project/commit/8aa0a785c423ebea84876b71f7b735bee96a0292.diff

LOG: gn build: (manually) merge d157a9bc

While here, also merge r335850 / r366396.

Added: 
    llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn

Modified: 
    llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn
    llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
index 8f7c27ebf0b6..3a48ab138675 100644
--- a/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
@@ -26,6 +26,7 @@ static_library("CodeGen") {
     "BranchRelaxation.cpp",
     "BreakFalseDeps.cpp",
     "BuiltinGCs.cpp",
+    "CFGuardLongjmp.cpp",
     "CFIInstrInserter.cpp",
     "CalcSpillWeights.cpp",
     "CallingConvLower.cpp",

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
index 0c27c11e2e0b..91fde1330ccb 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn
@@ -73,7 +73,9 @@ static_library("LLVMAArch64CodeGen") {
     "//llvm/lib/MC",
     "//llvm/lib/Support",
     "//llvm/lib/Target",
+    "//llvm/lib/Transforms/CFGuard",
     "//llvm/lib/Transforms/Scalar",
+    "//llvm/lib/Transforms/Utils",
   ]
   include_dirs = [ "." ]
   sources = [

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn
index 7713da709d82..ae90ba3c9f77 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn
@@ -57,6 +57,8 @@ static_library("LLVMARMCodeGen") {
     "//llvm/lib/MC",
     "//llvm/lib/Support",
     "//llvm/lib/Target",
+    "//llvm/lib/Transforms/CFGuard",
+    "//llvm/lib/Transforms/Utils",
   ]
   include_dirs = [ "." ]
   sources = [

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 4306c3631e90..ac29ad354d5f 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
@@ -70,6 +70,7 @@ static_library("LLVMX86CodeGen") {
     "//llvm/lib/MC",
     "//llvm/lib/Support",
     "//llvm/lib/Target",
+    "//llvm/lib/Transforms/CFGuard",
   ]
   if (x86_gen_fold_tables) {
     deps += [ ":X86GenFoldTables" ]

diff  --git a/llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn
new file mode 100644
index 000000000000..c6835096e0ad
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn
@@ -0,0 +1,10 @@
+static_library("CFGuard") {
+  output_name = "LLVMCFGuard"
+  deps = [
+    "//llvm/lib/IR",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "CFGuard.cpp",
+  ]
+}