summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2019-09-05 09:51:30 +0000
committerHans Wennborg <hans@hanshq.net>2019-09-05 09:51:30 +0000
commit1b8425cf6f834c14645231d3c2f58fc441f2b524 (patch)
treede102cdddfa1ef4dd3b1a1cad4b228de66f5e708
parent8b1a3a38388f66de44a1c76d2def01daa5333f76 (diff)
downloadllvm-1b8425cf6f834c14645231d3c2f58fc441f2b524.tar.gz
Merging r369310:
------------------------------------------------------------------------ r369310 | hubert.reinterpretcast | 2019-08-20 01:12:48 +0200 (Tue, 20 Aug 2019) | 24 lines [cmake] Link in LLVMPasses due to dependency by LLVMOrcJIT; NFC Summary: rL367756 (f5c40cb) increases the dependency of LLVMOrcJIT on LLVMPasses. In particular, symbols defined in LLVMPasses that are referenced by the destructor of `PassBuilder` are now referenced by LLVMOrcJIT through `Speculation.cpp.o`. We believe that referencing symbols defined in LLVMPasses in the destructor of `PassBuilder` is valid, and that adding to the set of such symbols is legitimate. To support such cases, this patch adds LLVMPasses to the set of libraries being linked when linking in LLVMOrcJIT causes such symbols from LLVMPasses to be referenced. Reviewers: Whitney, anhtuyen, pree-jackie Reviewed By: pree-jackie Subscribers: mgorny, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D66441 ------------------------------------------------------------------------ llvm-svn: 371042
-rw-r--r--llvm/lib/ExecutionEngine/Orc/CMakeLists.txt1
-rw-r--r--llvm/tools/lli/CMakeLists.txt1
-rw-r--r--llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt1
3 files changed, 3 insertions, 0 deletions
diff --git a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
index 2c1a772da372..d65dc877bf8b 100644
--- a/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
+++ b/llvm/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -33,4 +33,5 @@ target_link_libraries(LLVMOrcJIT
PRIVATE
LLVMBitReader
LLVMBitWriter
+ LLVMPasses
)
diff --git a/llvm/tools/lli/CMakeLists.txt b/llvm/tools/lli/CMakeLists.txt
index 42f6c2b2ede4..476c09229e63 100644
--- a/llvm/tools/lli/CMakeLists.txt
+++ b/llvm/tools/lli/CMakeLists.txt
@@ -12,6 +12,7 @@ set(LLVM_LINK_COMPONENTS
MCJIT
Object
OrcJIT
+ Passes
RuntimeDyld
SelectionDAG
Support
diff --git a/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt b/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
index 76b18fd1ba9a..945c9926d26e 100644
--- a/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
+++ b/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt
@@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS
ExecutionEngine
Object
OrcJIT
+ Passes
RuntimeDyld
Support
native