Merging r369310:

zmodem · zmodem · commit 1b8425cf6f83 · 2019-09-05T09:51:30.000Z
------------------------------------------------------------------------ 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
diff --git 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
@@ -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
@@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS
   ExecutionEngine
   Object
   OrcJIT
+  Passes
   RuntimeDyld
   Support
   native

Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,5 @@ target_link_libraries(LLVMOrcJIT`
`33`	`33`	`PRIVATE`
`34`	`34`	`LLVMBitReader`
`35`	`35`	`LLVMBitWriter`
	`36`	`+ LLVMPasses`
`36`	`37`	`)`