mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-08-13 18:49:52 +00:00
disable-fuzzer-compiler-rt.diff: bring back this patch. Disable fuzzer only for i386
This commit is contained in:
parent
30a8741518
commit
61796d6dac
3
debian/changelog
vendored
3
debian/changelog
vendored
@ -1,7 +1,8 @@
|
|||||||
llvm-toolchain-9 (1:9.0.0-3~exp2) experimental; urgency=medium
|
llvm-toolchain-9 (1:9.0.0-3~exp2) experimental; urgency=medium
|
||||||
|
|
||||||
* disable-fuzzer-compiler-rt.diff: bring back this patch
|
* disable-fuzzer-compiler-rt.diff: bring back this patch.
|
||||||
Still breaks i386 compiler-rt/fuzzer
|
Still breaks i386 compiler-rt/fuzzer
|
||||||
|
Disable fuzzer only for i386
|
||||||
|
|
||||||
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 30 Oct 2019 08:25:18 +0100
|
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 30 Oct 2019 08:25:18 +0100
|
||||||
|
|
||||||
|
29
debian/patches/disable-fuzzer-compiler-rt.diff
vendored
29
debian/patches/disable-fuzzer-compiler-rt.diff
vendored
@ -2,16 +2,16 @@ Index: llvm-toolchain-9-9.0.0/compiler-rt/lib/CMakeLists.txt
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-9-9.0.0.orig/compiler-rt/lib/CMakeLists.txt
|
--- llvm-toolchain-9-9.0.0.orig/compiler-rt/lib/CMakeLists.txt
|
||||||
+++ llvm-toolchain-9-9.0.0/compiler-rt/lib/CMakeLists.txt
|
+++ llvm-toolchain-9-9.0.0/compiler-rt/lib/CMakeLists.txt
|
||||||
@@ -56,6 +56,6 @@ if(COMPILER_RT_BUILD_XRAY)
|
@@ -57,5 +57,8 @@ if(COMPILER_RT_BUILD_XRAY)
|
||||||
compiler_rt_build_runtime(xray)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
-if(COMPILER_RT_BUILD_LIBFUZZER)
|
if(COMPILER_RT_BUILD_LIBFUZZER)
|
||||||
- compiler_rt_build_runtime(fuzzer)
|
- compiler_rt_build_runtime(fuzzer)
|
||||||
-endif()
|
+ if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" AND
|
||||||
+#if(COMPILER_RT_BUILD_LIBFUZZER)
|
+ NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686")
|
||||||
+# compiler_rt_build_runtime(fuzzer)
|
+ compiler_rt_build_runtime(fuzzer)
|
||||||
+#endif()
|
+ endif()
|
||||||
|
endif()
|
||||||
Index: llvm-toolchain-9-9.0.0/clang/runtime/CMakeLists.txt
|
Index: llvm-toolchain-9-9.0.0/clang/runtime/CMakeLists.txt
|
||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-9-9.0.0.orig/clang/runtime/CMakeLists.txt
|
--- llvm-toolchain-9-9.0.0.orig/clang/runtime/CMakeLists.txt
|
||||||
@ -29,16 +29,15 @@ Index: llvm-toolchain-9-9.0.0/compiler-rt/test/CMakeLists.txt
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- llvm-toolchain-9-9.0.0.orig/compiler-rt/test/CMakeLists.txt
|
--- llvm-toolchain-9-9.0.0.orig/compiler-rt/test/CMakeLists.txt
|
||||||
+++ llvm-toolchain-9-9.0.0/compiler-rt/test/CMakeLists.txt
|
+++ llvm-toolchain-9-9.0.0/compiler-rt/test/CMakeLists.txt
|
||||||
@@ -56,9 +56,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
|
@@ -57,7 +57,10 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
|
||||||
compiler_rt_test_runtime(sanitizer_common)
|
|
||||||
|
|
||||||
# OpenBSD not supporting asan, cannot run the tests
|
# OpenBSD not supporting asan, cannot run the tests
|
||||||
- if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID)
|
if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID)
|
||||||
- compiler_rt_test_runtime(fuzzer)
|
- compiler_rt_test_runtime(fuzzer)
|
||||||
- endif()
|
+ if(NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i386" AND
|
||||||
+# if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID)
|
+ NOT CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686")
|
||||||
+# compiler_rt_test_runtime(fuzzer)
|
+ compiler_rt_test_runtime(fuzzer)
|
||||||
+# endif()
|
+ endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD})
|
foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD})
|
||||||
# cfi testing is gated on ubsan
|
|
||||||
|
Loading…
Reference in New Issue
Block a user