Author: David Tenty Date: 2019-10-30T14:56:20-04:00 New Revision: 23df0c783c7053ddcdf665ebc8ddda350abd5bf2
URL: https://github.com/llvm/llvm-project/commit/23df0c783c7053ddcdf665ebc8ddda350abd5bf2 DIFF: https://github.com/llvm/llvm-project/commit/23df0c783c7053ddcdf665ebc8ddda350abd5bf2.diff LOG: Revert "[NFC] Rename LLVM_NO_DEAD_STRIP" This reverts commit 11c2a85db8849db1a5907e80d9966592248ef825. Added: Modified: clang/tools/driver/CMakeLists.txt llvm/cmake/modules/AddLLVM.cmake llvm/cmake/modules/HandleLLVMOptions.cmake llvm/tools/bugpoint/CMakeLists.txt llvm/tools/llc/CMakeLists.txt llvm/tools/opt/CMakeLists.txt Removed: ################################################################################ diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt index 5a8f57eb4668..590d708d837c 100644 --- a/clang/tools/driver/CMakeLists.txt +++ b/clang/tools/driver/CMakeLists.txt @@ -20,9 +20,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_SUPPORT_PLUGINS. +# LLVM_NO_DEAD_STRIP. if(CLANG_PLUGIN_SUPPORT) - set(LLVM_SUPPORT_PLUGINS 1) + set(LLVM_NO_DEAD_STRIP 1) endif() if(NOT CLANG_BUILT_STANDALONE) diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 41e72c7e9bcc..b5f612469ff9 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -228,7 +228,7 @@ function(add_link_opts target_name) # to enable. See https://sourceware.org/bugzilla/show_bug.cgi?id=17704. endif() - if(NOT LLVM_SUPPORT_PLUGINS) + if(NOT LLVM_NO_DEAD_STRIP) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # ld64's implementation of -dead_strip breaks tools that use plugins. set_property(TARGET ${target_name} APPEND_STRING PROPERTY @@ -245,7 +245,7 @@ function(add_link_opts target_name) set_property(TARGET ${target_name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--gc-sections") endif() - else() #LLVM_SUPPORT_PLUGINS + else() #LLVM_NO_DEAD_STRIP if(${CMAKE_SYSTEM_NAME} MATCHES "AIX") set_property(TARGET ${target_name} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-bnogc") diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index 5aa72568c656..03acea487977 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -744,7 +744,7 @@ endif() # Add flags for add_dead_strip(). # FIXME: With MSVS, consider compiling with /Gy and linking with /OPT:REF? # But MinSizeRel seems to add that automatically, so maybe disable these -# flags instead if LLVM_SUPPORT_PLUGINS is set. +# flags instead if LLVM_NO_DEAD_STRIP is set. if(NOT CYGWIN AND NOT WIN32) if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG") diff --git a/llvm/tools/bugpoint/CMakeLists.txt b/llvm/tools/bugpoint/CMakeLists.txt index 8b468691fa6b..031f51480cce 100644 --- a/llvm/tools/bugpoint/CMakeLists.txt +++ b/llvm/tools/bugpoint/CMakeLists.txt @@ -22,7 +22,7 @@ set(LLVM_LINK_COMPONENTS ) # Support plugins. -set(LLVM_SUPPORT_PLUGINS 1) +set(LLVM_NO_DEAD_STRIP 1) add_llvm_tool(bugpoint BugDriver.cpp diff --git a/llvm/tools/llc/CMakeLists.txt b/llvm/tools/llc/CMakeLists.txt index 8435b9de6fb4..300efdab10d0 100644 --- a/llvm/tools/llc/CMakeLists.txt +++ b/llvm/tools/llc/CMakeLists.txt @@ -20,7 +20,7 @@ set(LLVM_LINK_COMPONENTS ) # Support plugins. -set(LLVM_SUPPORT_PLUGINS 1) +set(LLVM_NO_DEAD_STRIP 1) add_llvm_tool(llc llc.cpp diff --git a/llvm/tools/opt/CMakeLists.txt b/llvm/tools/opt/CMakeLists.txt index 4f74a0571203..cb4ba5cfbced 100644 --- a/llvm/tools/opt/CMakeLists.txt +++ b/llvm/tools/opt/CMakeLists.txt @@ -25,7 +25,7 @@ set(LLVM_LINK_COMPONENTS ) # Support plugins. -set(LLVM_SUPPORT_PLUGINS 1) +set(LLVM_NO_DEAD_STRIP 1) add_llvm_tool(opt AnalysisWrappers.cpp _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits