proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-12 16:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase of the patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-04-09 08:45:35 +00:00
parent cb938219a3
commit ae779d5633
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/patches/add_symbols_versioning.patch vendored
View File

@ -4,7 +4,7 @@ This patch adds a very simple linker script to version the lib's symbols
and thus trying to avoid crashes if an application loads two different and thus trying to avoid crashes if an application loads two different
LLVM versions (as long as they do not share data between them). LLVM versions (as long as they do not share data between them).
Note that we deliberately *don't* make LLVM_4.0 depend on LLVM_4.0: Note that we deliberately *don't* make LLVM_3.9 depend on LLVM_3.8:
they're incompatible and the whole point of this patch is they're incompatible and the whole point of this patch is
to tell the linker that. to tell the linker that.
@ -12,29 +12,29 @@ Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
Author: Lisandro Damían Nicanor Pérez Meyer <lisandro@debian.org> Author: Lisandro Damían Nicanor Pérez Meyer <lisandro@debian.org>
Bug-Debian: https://bugs.debian.org/848368 Bug-Debian: https://bugs.debian.org/848368
Index: llvm-toolchain-snapshot_5.0~svn298832/tools/llvm-shlib/CMakeLists.txt Index: llvm-toolchain-4.0_4.0~svn299455/tools/llvm-shlib/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn298832.orig/tools/llvm-shlib/CMakeLists.txt --- llvm-toolchain-4.0_4.0~svn299455.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn298832/tools/llvm-shlib/CMakeLists.txt +++ llvm-toolchain-4.0_4.0~svn299455/tools/llvm-shlib/CMakeLists.txt
@@ -40,7 +40,7 @@ set_property(TARGET LLVM PROPERTY VERSIO @@ -40,7 +40,7 @@ set_property(TARGET LLVM PROPERTY VERSIO
list(REMOVE_DUPLICATES LIB_NAMES) list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf" if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # FIXME: It should be "GNU ld for elf"
# GNU ld doesn't resolve symbols in the version script. # GNU ld doesn't resolve symbols in the version script.
- set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) - set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
+ set(LIB_NAMES -Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) + set(LIB_NAMES -Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
endif() endif()
Index: llvm-toolchain-snapshot_5.0~svn298832/tools/llvm-shlib/simple_version_script.map Index: llvm-toolchain-4.0_4.0~svn299455/tools/llvm-shlib/simple_version_script.map
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ llvm-toolchain-snapshot_5.0~svn298832/tools/llvm-shlib/simple_version_script.map +++ llvm-toolchain-4.0_4.0~svn299455/tools/llvm-shlib/simple_version_script.map
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+LLVM_4.0 { global: *; }; +LLVM_4.0 { global: *; };
Index: llvm-toolchain-snapshot_5.0~svn298832/cmake/modules/AddLLVM.cmake Index: llvm-toolchain-4.0_4.0~svn299455/cmake/modules/AddLLVM.cmake
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn298832.orig/cmake/modules/AddLLVM.cmake --- llvm-toolchain-4.0_4.0~svn299455.orig/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_5.0~svn298832/cmake/modules/AddLLVM.cmake +++ llvm-toolchain-4.0_4.0~svn299455/cmake/modules/AddLLVM.cmake
@@ -82,7 +82,7 @@ function(add_llvm_symbol_exports target_ @@ -82,7 +82,7 @@ function(add_llvm_symbol_exports target_
set(native_export_file "${target_name}.exports") set(native_export_file "${target_name}.exports")
# FIXME: Don't write the "local:" line on OpenBSD. # FIXME: Don't write the "local:" line on OpenBSD.