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

d/p/add_symbols_versioning.patch removed (applied upstream)

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-04-18 06:10:36 +00:00
parent 9d19e19ec5
commit 99ff4c05f9
3 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ llvm-toolchain-snapshot (1:5.0~svn298832-1~exp2) UNRELEASED; urgency=medium
* Limit the archs where the ocaml binding is built
Should fix the FTBFS
Currently amd64 arm64 armel armhf i386
* d/p/add_symbols_versioning.patch removed (applied upstream)
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 15 Apr 2017 17:20:07 +0200

46
debian/patches/add_symbols_versioning.patch vendored
View File

@ -1,46 +0,0 @@
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_5.0 depend on LLVM_5.0:
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
Index: llvm-toolchain-snapshot_5.0~svn299826/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_5.0~svn299826.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn299826/tools/llvm-shlib/CMakeLists.txt
@@ -40,7 +40,7 @@ set_property(TARGET LLVM PROPERTY VERSIO
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"
# 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()
Index: llvm-toolchain-snapshot_5.0~svn299826/tools/llvm-shlib/simple_version_script.map
===================================================================
--- /dev/null
+++ llvm-toolchain-snapshot_5.0~svn299826/tools/llvm-shlib/simple_version_script.map
@@ -0,0 +1 @@
+LLVM_5.0 { global: *; };
Index: llvm-toolchain-snapshot_5.0~svn299826/cmake/modules/AddLLVM.cmake
===================================================================
--- llvm-toolchain-snapshot_5.0~svn299826.orig/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_5.0~svn299826/cmake/modules/AddLLVM.cmake
@@ -82,7 +82,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_5.0 {" > ${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

@ -44,6 +44,5 @@ lldb-addversion-suffix-to-llvm-server-exec.patch
lldb-missing-install.diff
silent-test-failing-codeverage.diff
disable-path-test-failing.diff
add_symbols_versioning.patch
silent-amd-tet.diff
disable-error-xray.diff