From cadea8b5edeabfb66de9f68078f4ccd6eaf51adb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 16 Oct 2020 23:33:42 +0200 Subject: [PATCH] rebase of the patches --- debian/patches/disable-fuzzer-compiler-rt-x86.diff | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/disable-fuzzer-compiler-rt-x86.diff b/debian/patches/disable-fuzzer-compiler-rt-x86.diff index ba7a32b6..36375df3 100644 --- a/debian/patches/disable-fuzzer-compiler-rt-x86.diff +++ b/debian/patches/disable-fuzzer-compiler-rt-x86.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_11~++20200418115741+8e0c5f72005/compiler-rt/lib/CMakeLists.txt +Index: llvm-toolchain-snapshot_12~++20201016112810+f16cecf3752/compiler-rt/lib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_11~++20200418115741+8e0c5f72005.orig/compiler-rt/lib/CMakeLists.txt -+++ llvm-toolchain-snapshot_11~++20200418115741+8e0c5f72005/compiler-rt/lib/CMakeLists.txt +--- llvm-toolchain-snapshot_12~++20201016112810+f16cecf3752.orig/compiler-rt/lib/CMakeLists.txt ++++ llvm-toolchain-snapshot_12~++20201016112810+f16cecf3752/compiler-rt/lib/CMakeLists.txt @@ -57,7 +57,10 @@ if(COMPILER_RT_BUILD_XRAY) endif() @@ -13,11 +13,11 @@ Index: llvm-toolchain-snapshot_11~++20200418115741+8e0c5f72005/compiler-rt/lib/C + endif() endif() - # It doesn't normally make sense to build runtimes when a sanitizer is enabled, -Index: llvm-toolchain-snapshot_11~++20200418115741+8e0c5f72005/compiler-rt/test/CMakeLists.txt + if(COMPILER_RT_BUILD_MEMPROF AND COMPILER_RT_HAS_SANITIZER_COMMON AND +Index: llvm-toolchain-snapshot_12~++20201016112810+f16cecf3752/compiler-rt/test/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_11~++20200418115741+8e0c5f72005.orig/compiler-rt/test/CMakeLists.txt -+++ llvm-toolchain-snapshot_11~++20200418115741+8e0c5f72005/compiler-rt/test/CMakeLists.txt +--- llvm-toolchain-snapshot_12~++20201016112810+f16cecf3752.orig/compiler-rt/test/CMakeLists.txt ++++ llvm-toolchain-snapshot_12~++20201016112810+f16cecf3752/compiler-rt/test/CMakeLists.txt @@ -55,7 +55,10 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) # OpenBSD not supporting asan, cannot run the tests