From 5c12680b55c408b3a8b51cf4d0380c8164edb849 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 15 Aug 2021 22:09:32 +0200 Subject: [PATCH] rebase of the patch --- .../patches/workaround-bug-42994-use-linker.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/workaround-bug-42994-use-linker.diff b/debian/patches/workaround-bug-42994-use-linker.diff index f2cfa116..2b12acb9 100644 --- a/debian/patches/workaround-bug-42994-use-linker.diff +++ b/debian/patches/workaround-bug-42994-use-linker.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_13~++20210517085206+0f417789192e/compiler-rt/lib/hwasan/CMakeLists.txt +Index: llvm-toolchain-snapshot_14~++20210815095329+44d0a99a12ec/compiler-rt/lib/hwasan/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_13~++20210517085206+0f417789192e.orig/compiler-rt/lib/hwasan/CMakeLists.txt -+++ llvm-toolchain-snapshot_13~++20210517085206+0f417789192e/compiler-rt/lib/hwasan/CMakeLists.txt -@@ -45,9 +45,9 @@ append_list_if(COMPILER_RT_HWASAN_WITH_I +--- llvm-toolchain-snapshot_14~++20210815095329+44d0a99a12ec.orig/compiler-rt/lib/hwasan/CMakeLists.txt ++++ llvm-toolchain-snapshot_14~++20210815095329+44d0a99a12ec/compiler-rt/lib/hwasan/CMakeLists.txt +@@ -52,9 +52,9 @@ endif() set(HWASAN_RTL_CFLAGS ${SANITIZER_COMMON_CFLAGS}) append_rtti_flag(OFF HWASAN_RTL_CFLAGS) @@ -12,9 +12,9 @@ Index: llvm-toolchain-snapshot_13~++20210517085206+0f417789192e/compiler-rt/lib/ -append_list_if(COMPILER_RT_HAS_FFREESTANDING_FLAG -ffreestanding HWASAN_RTL_CFLAGS) +append_list_if(COMPILER_RT_HAS_FFREESTANDING_FLAG -ffreestanding -fuse-ld=gold HWASAN_RTL_CFLAGS) - set(HWASAN_DYNAMIC_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS}) - -@@ -59,7 +59,7 @@ if(ANDROID) + # Too many existing bugs, needs cleanup. + append_list_if(COMPILER_RT_HAS_WNO_FORMAT -Wno-format HWASAN_RTL_CFLAGS) +@@ -69,7 +69,7 @@ if(ANDROID) endif() endif() @@ -23,7 +23,7 @@ Index: llvm-toolchain-snapshot_13~++20210517085206+0f417789192e/compiler-rt/lib/ append_list_if(COMPILER_RT_HAS_FTLS_MODEL_INITIAL_EXEC -ftls-model=initial-exec HWASAN_DYNAMIC_CFLAGS) append_list_if(MSVC /DEBUG HWASAN_DYNAMIC_LINK_FLAGS) -@@ -153,7 +153,7 @@ function(add_hwasan_runtimes arch use_al +@@ -163,7 +163,7 @@ function(add_hwasan_runtimes arch use_al LIBS ${hwasan_runtime}-${arch} ${hwasan_runtime}_cxx-${arch} EXTRA hwasan.syms.extra) set(VERSION_SCRIPT_FLAG