[BOLT] Support building bolt when LLVM_LINK_LLVM_DYLIB is ON

serge-sans-paille · serge-sans-paille · commit 61cff9079c08 · 2022-09-23T07:59:30.000+02:00
This does *not* link with libLLVM, but with static archives instead. Not super-great, but at least the build works, which is probably better than failing. Related to #57551 Differential Revision: https://reviews.llvm.org/D134434
diff --git a/bolt/lib/Core/CMakeLists.txt b/bolt/lib/Core/CMakeLists.txt
@@ -24,6 +24,7 @@ add_llvm_library(LLVMBOLTCore
   ParallelUtilities.cpp
   Relocation.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
   LINK_LIBS
   ${LLVM_PTHREAD_LIB}
   )
diff --git a/bolt/lib/Passes/CMakeLists.txt b/bolt/lib/Passes/CMakeLists.txt
@@ -45,6 +45,8 @@ add_llvm_library(LLVMBOLTPasses
   VeneerElimination.cpp
   RetpolineInsertion.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
   LINK_LIBS
   ${LLVM_PTHREAD_LIB}
 
diff --git a/bolt/lib/Profile/CMakeLists.txt b/bolt/lib/Profile/CMakeLists.txt
@@ -7,6 +7,8 @@ add_llvm_library(LLVMBOLTProfile
   YAMLProfileReader.cpp
   YAMLProfileWriter.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
   LINK_COMPONENTS
   Support
   )
diff --git a/bolt/lib/Rewrite/CMakeLists.txt b/bolt/lib/Rewrite/CMakeLists.txt
@@ -33,6 +33,8 @@ add_llvm_library(LLVMBOLTRewrite
   MachORewriteInstance.cpp
   RewriteInstance.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
   LINK_LIBS
   ${LLVM_PTHREAD_LIB}
   )
diff --git a/bolt/lib/RuntimeLibs/CMakeLists.txt b/bolt/lib/RuntimeLibs/CMakeLists.txt
@@ -10,6 +10,8 @@ add_llvm_library(LLVMBOLTRuntimeLibs
   RuntimeLibrary.cpp
   HugifyRuntimeLibrary.cpp
   InstrumentationRuntimeLibrary.cpp
+
+  DISABLE_LLVM_LINK_LLVM_DYLIB
   )
 
 target_link_libraries(LLVMBOLTRuntimeLibs
diff --git a/bolt/lib/Target/AArch64/CMakeLists.txt b/bolt/lib/Target/AArch64/CMakeLists.txt
@@ -7,6 +7,8 @@ set(LLVM_LINK_COMPONENTS
 add_llvm_library(LLVMBOLTTargetAArch64
   AArch64MCPlusBuilder.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
   DEPENDS
   AArch64CommonTableGen
   )
diff --git a/bolt/lib/Target/X86/CMakeLists.txt b/bolt/lib/Target/X86/CMakeLists.txt
@@ -9,6 +9,8 @@ add_llvm_library(LLVMBOLTTargetX86
   X86MCPlusBuilder.cpp
   X86MCSymbolizer.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
   DEPENDS
   X86CommonTableGen
   )
diff --git a/bolt/lib/Utils/CMakeLists.txt b/bolt/lib/Utils/CMakeLists.txt
@@ -2,6 +2,8 @@ add_llvm_library(LLVMBOLTUtils
   CommandLineOpts.cpp
   Utils.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
   LINK_LIBS
   ${LLVM_PTHREAD_LIB}
 
diff --git a/bolt/tools/bat-dump/CMakeLists.txt b/bolt/tools/bat-dump/CMakeLists.txt
@@ -5,6 +5,8 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_tool(llvm-bat-dump
   bat-dump.cpp
+
+  DISABLE_LLVM_LINK_LLVM_DYLIB
   )
 
 target_link_libraries(llvm-bat-dump
diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt
@@ -14,6 +14,8 @@ endif()
 add_bolt_tool(llvm-bolt
   llvm-bolt.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
   DEPENDS
   ${BOLT_DRIVER_DEPS}
   )
diff --git a/bolt/tools/heatmap/CMakeLists.txt b/bolt/tools/heatmap/CMakeLists.txt
@@ -7,6 +7,7 @@ set(LLVM_LINK_COMPONENTS
 
 add_bolt_tool(llvm-bolt-heatmap
   heatmap.cpp
+  DISABLE_LLVM_LINK_LLVM_DYLIB
   )
 
 target_link_libraries(llvm-bolt-heatmap
diff --git a/bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt b/bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt
@@ -4,6 +4,8 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_fuzzer(llvm-bolt-fuzzer
   llvm-bolt-fuzzer.cpp
+
+  DISABLE_LLVM_LINK_LLVM_DYLIB
   )
 
 if (TARGET llvm-bolt-fuzzer)
diff --git a/bolt/tools/merge-fdata/CMakeLists.txt b/bolt/tools/merge-fdata/CMakeLists.txt
@@ -3,6 +3,8 @@ set(LLVM_LINK_COMPONENTS Support)
 add_bolt_tool(merge-fdata
   merge-fdata.cpp
 
+  DISABLE_LLVM_LINK_LLVM_DYLIB
+
   DEPENDS
   intrinsics_gen
 )
diff --git a/bolt/unittests/Core/CMakeLists.txt b/bolt/unittests/Core/CMakeLists.txt
@@ -9,6 +9,8 @@ add_bolt_unittest(CoreTests
   BinaryContext.cpp
   MCPlusBuilder.cpp
   DynoStats.cpp
+
+  DISABLE_LLVM_LINK_LLVM_DYLIB
   )
 
 target_link_libraries(CoreTests
diff --git a/bolt/unittests/Profile/CMakeLists.txt b/bolt/unittests/Profile/CMakeLists.txt
@@ -1,5 +1,7 @@
 add_bolt_unittest(ProfileTests
   DataAggregator.cpp
+
+  DISABLE_LLVM_LINK_LLVM_DYLIB
   )
 
 target_link_libraries(ProfileTests

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ add_llvm_library(LLVMBOLTCore`
`24`	`24`	`ParallelUtilities.cpp`
`25`	`25`	`Relocation.cpp`
`26`	`26`
	`27`	`+ DISABLE_LLVM_LINK_LLVM_DYLIB`
`27`	`28`	`LINK_LIBS`
`28`	`29`	`${LLVM_PTHREAD_LIB}`
`29`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ add_llvm_library(LLVMBOLTProfile`
`7`	`7`	`YAMLProfileReader.cpp`
`8`	`8`	`YAMLProfileWriter.cpp`
`9`	`9`
	`10`	`+ DISABLE_LLVM_LINK_LLVM_DYLIB`
	`11`	`+`
`10`	`12`	`LINK_COMPONENTS`
`11`	`13`	`Support`
`12`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ add_llvm_library(LLVMBOLTRewrite`
`33`	`33`	`MachORewriteInstance.cpp`
`34`	`34`	`RewriteInstance.cpp`
`35`	`35`
	`36`	`+ DISABLE_LLVM_LINK_LLVM_DYLIB`
	`37`	`+`
`36`	`38`	`LINK_LIBS`
`37`	`39`	`${LLVM_PTHREAD_LIB}`
`38`	`40`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ add_llvm_library(LLVMBOLTRuntimeLibs`
`10`	`10`	`RuntimeLibrary.cpp`
`11`	`11`	`HugifyRuntimeLibrary.cpp`
`12`	`12`	`InstrumentationRuntimeLibrary.cpp`
	`13`	`+`
	`14`	`+ DISABLE_LLVM_LINK_LLVM_DYLIB`
`13`	`15`	`)`
`14`	`16`
`15`	`17`	`target_link_libraries(LLVMBOLTRuntimeLibs`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ set(LLVM_LINK_COMPONENTS`
`7`	`7`	`add_llvm_library(LLVMBOLTTargetAArch64`
`8`	`8`	`AArch64MCPlusBuilder.cpp`
`9`	`9`
	`10`	`+ DISABLE_LLVM_LINK_LLVM_DYLIB`
	`11`	`+`
`10`	`12`	`DEPENDS`
`11`	`13`	`AArch64CommonTableGen`
`12`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ add_llvm_library(LLVMBOLTTargetX86`
`9`	`9`	`X86MCPlusBuilder.cpp`
`10`	`10`	`X86MCSymbolizer.cpp`
`11`	`11`
	`12`	`+ DISABLE_LLVM_LINK_LLVM_DYLIB`
	`13`	`+`
`12`	`14`	`DEPENDS`
`13`	`15`	`X86CommonTableGen`
`14`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ set(LLVM_LINK_COMPONENTS`
`5`	`5`
`6`	`6`	`add_llvm_tool(llvm-bat-dump`
`7`	`7`	`bat-dump.cpp`
	`8`	`+`
	`9`	`+ DISABLE_LLVM_LINK_LLVM_DYLIB`
`8`	`10`	`)`
`9`	`11`
`10`	`12`	`target_link_libraries(llvm-bat-dump`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ endif()`
`14`	`14`	`add_bolt_tool(llvm-bolt`
`15`	`15`	`llvm-bolt.cpp`
`16`	`16`
	`17`	`+ DISABLE_LLVM_LINK_LLVM_DYLIB`
	`18`	`+`
`17`	`19`	`DEPENDS`
`18`	`20`	`${BOLT_DRIVER_DEPS}`
`19`	`21`	`)`