From 908dbe1d6cf05975e2351245264dbf2720901ae1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 25 Oct 2019 09:26:30 +0200 Subject: [PATCH] add the patch --- .../compiler-rt-fuzzer-remove-elf_i386.diff | 13 ------------- debian/patches/disable-fuzzer-compiler-rt.diff | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 debian/patches/compiler-rt-fuzzer-remove-elf_i386.diff create mode 100644 debian/patches/disable-fuzzer-compiler-rt.diff diff --git a/debian/patches/compiler-rt-fuzzer-remove-elf_i386.diff b/debian/patches/compiler-rt-fuzzer-remove-elf_i386.diff deleted file mode 100644 index 6ad83dc0..00000000 --- a/debian/patches/compiler-rt-fuzzer-remove-elf_i386.diff +++ /dev/null @@ -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() diff --git a/debian/patches/disable-fuzzer-compiler-rt.diff b/debian/patches/disable-fuzzer-compiler-rt.diff new file mode 100644 index 00000000..c067b65f --- /dev/null +++ b/debian/patches/disable-fuzzer-compiler-rt.diff @@ -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()