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

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

Browse Source
This commit is contained in:
Sylvestre Ledru 2020-03-01 22:08:44 +01:00
commit 38f5985905
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -31,6 +31,14 @@ llvm-toolchain-snapshot (1:11~++20200123111717+04fd2041561-1~exp1) experimental;
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 23 Jan 2020 14:52:30 +0100
llvm-toolchain-10 (1:10.0.0~+rc2-3) unstable; urgency=medium
* Disable libfuzzer on x86
https://bugs.llvm.org/show_bug.cgi?id=43677
FTBFS otherwise
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 01 Mar 2020 20:59:25 +0100
llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium
[ Sylvestre Ledru ]

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

@ -0,0 +1,30 @@
Index: llvm-toolchain-10-10.0.0~+rc2/compiler-rt/lib/CMakeLists.txt
===================================================================
--- llvm-toolchain-10-10.0.0~+rc2.orig/compiler-rt/lib/CMakeLists.txt
+++ llvm-toolchain-10-10.0.0~+rc2/compiler-rt/lib/CMakeLists.txt
@@ -57,5 +57,8 @@ if(COMPILER_RT_BUILD_XRAY)
endif()
if(COMPILER_RT_BUILD_LIBFUZZER)
- compiler_rt_build_runtime(fuzzer)
+ if(NOT(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" OR CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686"))
+ # Disabled because of https://bugs.llvm.org/show_bug.cgi?id=43677
+ compiler_rt_build_runtime(fuzzer)
+ endif()
endif()
Index: llvm-toolchain-10-10.0.0~+rc2/compiler-rt/test/CMakeLists.txt
===================================================================
--- llvm-toolchain-10-10.0.0~+rc2.orig/compiler-rt/test/CMakeLists.txt
+++ llvm-toolchain-10-10.0.0~+rc2/compiler-rt/test/CMakeLists.txt
@@ -55,7 +55,10 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
# OpenBSD not supporting asan, cannot run the tests
if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID)
- compiler_rt_test_runtime(fuzzer)
+ if(NOT(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" OR CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686"))
+ # Disabled because of https://bugs.llvm.org/show_bug.cgi?id=43677
+ compiler_rt_test_runtime(fuzzer)
+ endif()
endif()
foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD})

1
debian/patches/series vendored
View File

@ -135,6 +135,7 @@ workaround-bug-42994-use-linker.diff
# bug 939472
#try-to-unbreak-thinlto.diff
D67877.patch
disable-fuzzer-compiler-rt-x86.diff
no-z3.patch
python3-shebang.patch