Author: Shubham Sandeep Rastogi Date: 2024-11-19T16:53:21-08:00 New Revision: 673b5dd380e8457c887d5b321195d81ea90f134d
URL: https://github.com/llvm/llvm-project/commit/673b5dd380e8457c887d5b321195d81ea90f134d DIFF: https://github.com/llvm/llvm-project/commit/673b5dd380e8457c887d5b321195d81ea90f134d.diff LOG: Revert "Introduce symbol versioning for clang-cpp (#116556)" This reverts commit 944478dd62a78f6bb43d4da210643affcc4584b6. Reverted because of following error on greendragon ld: unknown options: --version-script clang: error: linker command failed with exit code 1 (use -v to see invocation) Added: Modified: clang/tools/clang-shlib/CMakeLists.txt llvm/CMakeLists.txt Removed: clang/tools/clang-shlib/simple_version_script.map.in ################################################################################ diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt index 830f2b138ffa16..298d3a9d18fec8 100644 --- a/clang/tools/clang-shlib/CMakeLists.txt +++ b/clang/tools/clang-shlib/CMakeLists.txt @@ -48,14 +48,6 @@ add_clang_library(clang-cpp ${_OBJECTS} LINK_LIBS ${_DEPS}) - -configure_file(simple_version_script.map.in simple_version_script.map) - -if (NOT LLVM_LINKER_IS_SOLARISLD AND NOT MINGW) - # Solaris ld does not accept global: *; so there is no way to version *all* global symbols - target_link_options(clang-cpp PRIVATE LINKER:--version-script,${CMAKE_CURRENT_BINARY_DIR}/simple_version_script.map) -endif() - # Optimize function calls for default visibility definitions to avoid PLT and # reduce dynamic relocations. if (NOT APPLE AND NOT MINGW AND NOT LLVM_LINKER_IS_SOLARISLD_ILLUMOS) diff --git a/clang/tools/clang-shlib/simple_version_script.map.in b/clang/tools/clang-shlib/simple_version_script.map.in deleted file mode 100644 index cb2306d1f59682..00000000000000 --- a/clang/tools/clang-shlib/simple_version_script.map.in +++ /dev/null @@ -1 +0,0 @@ -@LLVM_SHLIB_SYMBOL_VERSION@ { global: *; }; diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index cfcf1404d82b7c..74b72c98253413 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -27,7 +27,7 @@ if (NOT PACKAGE_VERSION) endif() if(NOT DEFINED LLVM_SHLIB_SYMBOL_VERSION) - # "Symbol version prefix for libLLVM.so and libclang-cpp.so" + # "Symbol version prefix for libLLVM.so" set(LLVM_SHLIB_SYMBOL_VERSION "LLVM_${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}") endif() _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
