[NFC] Add SUPPORT_PLUGINS to add_llvm_executable()

daltenty · daltenty · commit 6740a88dc18d · 2019-11-06T14:32:35.000-05:00
Summary: this allows us to move logic about when it is appropriate set LLVM_NO_DEAD_STRIP out of each tool and into add_llvm_executable, which will enable future platform specific handling. This is a follow on to the reverted D69356 Reviewers: hubert.reinterpretcast, beanz, lhames Reviewed By: beanz Subscribers: mgorny, cfe-commits, llvm-commits Tags: #clang, #llvm Differential Revision: https://reviews.llvm.org/D69638
diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt
@@ -19,10 +19,9 @@ set( LLVM_LINK_COMPONENTS
 
 option(CLANG_PLUGIN_SUPPORT "Build clang with plugin support" ON)
 
-# Support plugins. This must be before add_clang_executable as it reads
-# LLVM_NO_DEAD_STRIP.
+# Support plugins.
 if(CLANG_PLUGIN_SUPPORT)
-  set(LLVM_NO_DEAD_STRIP 1)
+  set(support_plugins SUPPORT_PLUGINS)
 endif()
 
 if(NOT CLANG_BUILT_STANDALONE)
@@ -37,6 +36,7 @@ add_clang_tool(clang
 
   DEPENDS
   ${tablegen_deps}
+  ${support_plugins}
   )
 
 clang_target_link_libraries(clang
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
@@ -732,7 +732,7 @@ endmacro(add_llvm_library name)
 
 macro(add_llvm_executable name)
   cmake_parse_arguments(ARG
-    "DISABLE_LLVM_LINK_LLVM_DYLIB;IGNORE_EXTERNALIZE_DEBUGINFO;NO_INSTALL_RPATH"
+    "DISABLE_LLVM_LINK_LLVM_DYLIB;IGNORE_EXTERNALIZE_DEBUGINFO;NO_INSTALL_RPATH;SUPPORT_PLUGINS"
     "ENTITLEMENTS;BUNDLE_PATH"
     "DEPENDS"
     ${ARGN})
@@ -782,6 +782,11 @@ macro(add_llvm_executable name)
   if(NOT LLVM_ENABLE_OBJLIB)
     llvm_update_compile_flags(${name})
   endif()
+
+  if (ARG_SUPPORT_PLUGINS)
+    set(LLVM_NO_DEAD_STRIP On)
+  endif()
+
   add_link_opts( ${name} )
 
   # Do not add -Dname_EXPORTS to the command-line when building files in this
diff --git a/llvm/tools/bugpoint/CMakeLists.txt b/llvm/tools/bugpoint/CMakeLists.txt
@@ -21,9 +21,6 @@ set(LLVM_LINK_COMPONENTS
   Vectorize
   )
 
-# Support plugins.
-set(LLVM_NO_DEAD_STRIP 1)
-
 add_llvm_tool(bugpoint
   BugDriver.cpp
   CrashDebugger.cpp
@@ -37,6 +34,7 @@ add_llvm_tool(bugpoint
 
   DEPENDS
   intrinsics_gen
+  SUPPORT_PLUGINS
   )
 export_executable_symbols(bugpoint)
 
diff --git a/llvm/tools/llc/CMakeLists.txt b/llvm/tools/llc/CMakeLists.txt
@@ -19,13 +19,11 @@ set(LLVM_LINK_COMPONENTS
   Vectorize
   )
 
-# Support plugins.
-set(LLVM_NO_DEAD_STRIP 1)
-
 add_llvm_tool(llc
   llc.cpp
 
   DEPENDS
   intrinsics_gen
+  SUPPORT_PLUGINS
   )
 export_executable_symbols(llc)
diff --git a/llvm/tools/opt/CMakeLists.txt b/llvm/tools/opt/CMakeLists.txt
@@ -24,9 +24,6 @@ set(LLVM_LINK_COMPONENTS
   Passes
   )
 
-# Support plugins.
-set(LLVM_NO_DEAD_STRIP 1)
-
 add_llvm_tool(opt
   AnalysisWrappers.cpp
   BreakpointPrinter.cpp
@@ -39,6 +36,7 @@ add_llvm_tool(opt
 
   DEPENDS
   intrinsics_gen
+  SUPPORT_PLUGINS
   )
 export_executable_symbols(opt)
 

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@ set(LLVM_LINK_COMPONENTS`
`21`	`21`	`Vectorize`
`22`	`22`	`)`
`23`	`23`
`24`		`-# Support plugins.`
`25`		`-set(LLVM_NO_DEAD_STRIP 1)`
`26`		`-`
`27`	`24`	`add_llvm_tool(bugpoint`
`28`	`25`	`BugDriver.cpp`
`29`	`26`	`CrashDebugger.cpp`
`@@ -37,6 +34,7 @@ add_llvm_tool(bugpoint`
`37`	`34`
`38`	`35`	`DEPENDS`
`39`	`36`	`intrinsics_gen`
	`37`	`+ SUPPORT_PLUGINS`
`40`	`38`	`)`
`41`	`39`	`export_executable_symbols(bugpoint)`
`42`	`40`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,11 @@ set(LLVM_LINK_COMPONENTS`
`19`	`19`	`Vectorize`
`20`	`20`	`)`
`21`	`21`
`22`		`-# Support plugins.`
`23`		`-set(LLVM_NO_DEAD_STRIP 1)`
`24`		`-`
`25`	`22`	`add_llvm_tool(llc`
`26`	`23`	`llc.cpp`
`27`	`24`
`28`	`25`	`DEPENDS`
`29`	`26`	`intrinsics_gen`
	`27`	`+ SUPPORT_PLUGINS`
`30`	`28`	`)`
`31`	`29`	`export_executable_symbols(llc)`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,6 @@ set(LLVM_LINK_COMPONENTS`
`24`	`24`	`Passes`
`25`	`25`	`)`
`26`	`26`
`27`		`-# Support plugins.`
`28`		`-set(LLVM_NO_DEAD_STRIP 1)`
`29`		`-`
`30`	`27`	`add_llvm_tool(opt`
`31`	`28`	`AnalysisWrappers.cpp`
`32`	`29`	`BreakpointPrinter.cpp`
`@@ -39,6 +36,7 @@ add_llvm_tool(opt`
`39`	`36`
`40`	`37`	`DEPENDS`
`41`	`38`	`intrinsics_gen`
	`39`	`+ SUPPORT_PLUGINS`
`42`	`40`	`)`
`43`	`41`	`export_executable_symbols(opt)`
`44`	`42`