[llvm-branch-commits] [llvm-branch] r338842 - Merging r338751:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Aug  3 03:15:36 2018
New Revision: 338842

URL: http://llvm.org/viewvc/llvm-project?rev=338842&view=rev
Log:
Merging r338751:
------------------------------------------------------------------------
r338751 | tstellar | 2018-08-02 20:16:10 +0200 (Thu, 02 Aug 2018) | 13 lines

CMake: Remove LLVM_DYLIB_SYMBOL_VERSIONING

Summary:
This option is no longer needed since r300496 added symbol
versioning by default

Reviewers: sylvestre.ledru, beanz, mgorny

Reviewed By: mgorny

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D49835
------------------------------------------------------------------------

Modified:
    llvm/branches/release_70/   (props changed)
    llvm/branches/release_70/CMakeLists.txt
    llvm/branches/release_70/tools/llvm-shlib/CMakeLists.txt

Propchange: llvm/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug  3 03:15:36 2018
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,338552,338554,338658,338682,338703,338709
+/llvm/trunk:155241,338552,338554,338658,338682,338703,338709,338751

Modified: llvm/branches/release_70/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/CMakeLists.txt?rev=338842&r1=338841&r2=338842&view=diff
==============================================================================
--- llvm/branches/release_70/CMakeLists.txt (original)
+++ llvm/branches/release_70/CMakeLists.txt Fri Aug  3 03:15:36 2018
@@ -557,8 +557,6 @@ if(LLVM_LINK_LLVM_DYLIB OR LLVM_BUILD_LL
 endif()
 option(LLVM_BUILD_LLVM_DYLIB "Build libllvm dynamic library" ${LLVM_BUILD_LLVM_DYLIB_default})
 
-option(LLVM_DYLIB_SYMBOL_VERSIONING OFF)
-
 option(LLVM_OPTIMIZED_TABLEGEN "Force TableGen to be built with optimization" OFF)
 if(CMAKE_CROSSCOMPILING OR (LLVM_OPTIMIZED_TABLEGEN AND (LLVM_ENABLE_ASSERTIONS OR CMAKE_CONFIGURATION_TYPES)))
   set(LLVM_USE_HOST_TOOLS ON)

Modified: llvm/branches/release_70/tools/llvm-shlib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/tools/llvm-shlib/CMakeLists.txt?rev=338842&r1=338841&r2=338842&view=diff
==============================================================================
--- llvm/branches/release_70/tools/llvm-shlib/CMakeLists.txt (original)
+++ llvm/branches/release_70/tools/llvm-shlib/CMakeLists.txt Fri Aug  3 03:15:36 2018
@@ -59,10 +59,6 @@ endif()
 
 target_link_libraries(LLVM PRIVATE ${LIB_NAMES})
 
-if (LLVM_DYLIB_SYMBOL_VERSIONING)
-  set_property(TARGET LLVM APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--default-symver")
-endif()
-
 if (APPLE)
   set_property(TARGET LLVM APPEND_STRING PROPERTY
               LINK_FLAGS