From e042e5407dcbfca143e437d147cba36cb64916f7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 29 Feb 2020 23:54:01 +0100 Subject: [PATCH] Bring back libfuzzer, for some reasons I don't remember I disabled it: --- debian/changelog | 4 +-- .../patches/disable-fuzzer-compiler-rt.diff | 31 ------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 debian/patches/disable-fuzzer-compiler-rt.diff diff --git a/debian/changelog b/debian/changelog index 64ce011e..43b9024c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium [ Sylvestre Ledru ] - * Pass -DCOMPILER_RT_USE_LIBCXX=NO to the build system - to bring fuzzer library back + * Bring back libfuzzer, for some reasons I don't remember + I disabled it: https://bugs.llvm.org/show_bug.cgi?id=41956 [ Aurelien Jarno ] diff --git a/debian/patches/disable-fuzzer-compiler-rt.diff b/debian/patches/disable-fuzzer-compiler-rt.diff deleted file mode 100644 index 803327a6..00000000 --- a/debian/patches/disable-fuzzer-compiler-rt.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/lib/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373.orig/compiler-rt/lib/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/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() -Index: llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/test/CMakeLists.txt -=================================================================== ---- llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373.orig/compiler-rt/test/CMakeLists.txt -+++ llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/test/CMakeLists.txt -@@ -54,9 +54,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) - compiler_rt_test_runtime(sanitizer_common) - - # 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) -- endif() -+# if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID) -+# compiler_rt_test_runtime(fuzzer) -+# endif() - - foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD}) - # cfi testing is gated on ubsan diff --git a/debian/patches/series b/debian/patches/series index 8aa59fc8..234a507e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -133,7 +133,6 @@ workaround-bug-42994-use-linker.diff # bug 939472 #try-to-unbreak-thinlto.diff D67877.patch -disable-fuzzer-compiler-rt.diff no-z3.patch python3-shebang.patch