proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-14 15:46:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update of the patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-03-19 22:07:06 +00:00
parent 03fa05eea2
commit b9e921b521
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
debian/patches/add_symbols_versioning.patch vendored Normal file
View File

@ -0,0 +1,41 @@
Description: add a simple linker script to version LLVM symbols
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
LLVM versions (as long as they do not share data between them).
Note that we deliberately *don't* make LLVM_3.8 depend on LLVM_3.8:
they're incompatible and the whole point of this patch is
to tell the linker that.
Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
Author: Lisandro Damían Nicanor Pérez Meyer <lisandro@debian.org>
Bug-Debian: https://bugs.debian.org/848368
--- llvm-toolchain-3.8-3.8.1.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-3.8-3.8.1/tools/llvm-shlib/CMakeLists.txt
@@ -42,7 +42,7 @@ set_property(TARGET LLVM PROPERTY VERSIO
list(REMOVE_DUPLICATES LIB_NAMES)
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "GNU" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "kFreeBSD") # FIXME: It should be "GNU ld for elf"
# 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,--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")
set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
endif()
--- /dev/null
+++ llvm-toolchain-3.8-3.8.1/tools/llvm-shlib/simple_version_script.map
@@ -0,0 +1 @@
+LLVM_3.8 { global: *; };
--- llvm-toolchain-3.8-3.8.1.orig/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-3.8-3.8.1/cmake/modules/AddLLVM.cmake
@@ -74,7 +74,7 @@ function(add_llvm_symbol_exports target_
set(native_export_file "${target_name}.exports")
# FIXME: Don't write the "local:" line on OpenBSD.
add_custom_command(OUTPUT ${native_export_file}
- COMMAND echo "{" > ${native_export_file}
+ COMMAND echo "LLVM_3.8 {" > ${native_export_file}
COMMAND grep -q "[[:alnum:]]" ${export_file} && echo " global:" >> ${native_export_file} || :
COMMAND sed -e "s/$/;/" -e "s/^/ /" < ${export_file} >> ${native_export_file}
COMMAND echo " local: *;" >> ${native_export_file}

1
debian/patches/series vendored
View File

@ -56,3 +56,4 @@ lit-force-lang.diff
clang-arm-default-vfp3-on-armv7a.patch
lldb-server-path.diff
lldb-server-link.diff
add_symbols_versioning.patch