proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-10-17 20:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/9' into snapshot

Browse Source
This commit is contained in:
Sylvestre Ledru 2019-10-25 09:30:26 +02:00
commit f6afd2a986
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -134,12 +134,13 @@ llvm-toolchain-9 (1:9.0.0-2) unstable; urgency=medium
So, add to PROJECTS only when enabled
* clang: Force the installation of libclang-cpp with the exact same version
and remove libclang as dep
* For some reasons, building compiler-rt with the github method
is changing some options. It seems that it adds -m elf_i386 to the
linker. Causing a build failure.
* With the github move, libfuzzer is now compiled as part of the build
process. It fails to compile for some unexpected reasons.
As I have been compiling libfuzzer by hand for a while, just still
do this.
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=942864
https://bugs.llvm.org/show_bug.cgi?id=43677
trying to remove the flag in compiler-rt-fuzzer-remove-elf_i386.diff
disable-fuzzer-compiler-rt.diff
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 20 Oct 2019 17:27:50 +0200

13
debian/patches/compiler-rt-fuzzer-remove-elf_i386.diff vendored
View File

@ -1,13 +0,0 @@
Index: llvm-toolchain-snapshot-10~+201910241319490700d0bd3fc88be/compiler-rt/lib/fuzzer/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot-10~+201910241319490700d0bd3fc88be.orig/compiler-rt/lib/fuzzer/CMakeLists.txt
+++ llvm-toolchain-snapshot-10~+201910241319490700d0bd3fc88be/compiler-rt/lib/fuzzer/CMakeLists.txt
@@ -122,7 +122,7 @@ if(OS_NAME MATCHES "Linux|Fuchsia" AND
COMPILER_RT_LIBCXXABI_PATH)
macro(partially_link_libcxx name dir arch)
if(${arch} MATCHES "i386")
- set(EMULATION_ARGUMENT "-m" "elf_i386")
+ set(EMULATION_ARGUMENT "")
else()
set(EMULATION_ARGUMENT "")
endif()

14
debian/patches/disable-fuzzer-compiler-rt.diff vendored Normal file
View File

@ -0,0 +1,14 @@
Index: llvm-toolchain-snapshot_10~+20191025004812+60b403e75cd/compiler-rt/lib/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_10~+20191025004812+60b403e75cd.orig/compiler-rt/lib/CMakeLists.txt
+++ llvm-toolchain-snapshot_10~+20191025004812+60b403e75cd/compiler-rt/lib/CMakeLists.txt
@@ -56,6 +56,6 @@ if(COMPILER_RT_BUILD_XRAY)
compiler_rt_build_runtime(xray)
endif()
-if(COMPILER_RT_BUILD_LIBFUZZER)
- compiler_rt_build_runtime(fuzzer)
-endif()
+#if(COMPILER_RT_BUILD_LIBFUZZER)
+# compiler_rt_build_runtime(fuzzer)
+#endif()

1
debian/unpack.sh vendored
View File

@ -4,7 +4,6 @@ MAJOR_VERSION=10 # 8.0.1
REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru`
VERSION=$REV
echo $VERSION
#VERSION=+rc3
LLVM_ARCHIVE=llvm-toolchain-${ORIG_VERSION}_$MAJOR_VERSION~+$VERSION.orig.tar.xz
echo "unpack of $LLVM_ARCHIVE"