summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2019-10-28 14:17:07 -0400
committerNico Weber <thakis@chromium.org>2019-10-28 14:18:56 -0400
commit8aa0a785c423ebea84876b71f7b735bee96a0292 (patch)
tree4e9773713b6dcd567be1fc989b2409ebb4de03c2 /llvm
parentda2a4c234dcda0677d89051408b38d50d44991fe (diff)
downloadbcm5719-llvm-8aa0a785c423ebea84876b71f7b735bee96a0292.tar.gz
bcm5719-llvm-8aa0a785c423ebea84876b71f7b735bee96a0292.zip
gn build: (manually) merge d157a9bc
While here, also merge r335850 / r366396.
Diffstat (limited to 'llvm')
-rw-r--r--llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn1
-rw-r--r--llvm/utils/gn/secondary/llvm/lib/Target/AArch64/BUILD.gn2
-rw-r--r--llvm/utils/gn/secondary/llvm/lib/Target/ARM/BUILD.gn2
-rw-r--r--llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn1
-rw-r--r--llvm/utils/gn/secondary/llvm/lib/Transforms/CFGuard/BUILD.gn10
5 files changed, 16 insertions, 0 deletions
diff --git a/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/CodeGen/BUILD.gn
index 8f7c27ebf0b..3a48ab13867 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 0c27c11e2e0..91fde1330cc 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 7713da709d8..ae90ba3c9f7 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 4306c3631e9..ac29ad354d5 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 00000000000..c6835096e0a
--- /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",
+ ]
+}
OpenPOWER on IntegriCloud