rebase of the patch

This commit is contained in:
Sylvestre Ledru 2021-08-15 22:09:32 +02:00
parent ae2d02698a
commit 5c12680b55

View File

@ -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_14~++20210815095329+44d0a99a12ec.orig/compiler-rt/lib/hwasan/CMakeLists.txt
+++ llvm-toolchain-snapshot_13~++20210517085206+0f417789192e/compiler-rt/lib/hwasan/CMakeLists.txt +++ llvm-toolchain-snapshot_14~++20210815095329+44d0a99a12ec/compiler-rt/lib/hwasan/CMakeLists.txt
@@ -45,9 +45,9 @@ append_list_if(COMPILER_RT_HWASAN_WITH_I @@ -52,9 +52,9 @@ endif()
set(HWASAN_RTL_CFLAGS ${SANITIZER_COMMON_CFLAGS}) set(HWASAN_RTL_CFLAGS ${SANITIZER_COMMON_CFLAGS})
append_rtti_flag(OFF HWASAN_RTL_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 HWASAN_RTL_CFLAGS)
+append_list_if(COMPILER_RT_HAS_FFREESTANDING_FLAG -ffreestanding -fuse-ld=gold 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}) # Too many existing bugs, needs cleanup.
append_list_if(COMPILER_RT_HAS_WNO_FORMAT -Wno-format HWASAN_RTL_CFLAGS)
@@ -59,7 +59,7 @@ if(ANDROID) @@ -69,7 +69,7 @@ if(ANDROID)
endif() endif()
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 append_list_if(COMPILER_RT_HAS_FTLS_MODEL_INITIAL_EXEC
-ftls-model=initial-exec HWASAN_DYNAMIC_CFLAGS) -ftls-model=initial-exec HWASAN_DYNAMIC_CFLAGS)
append_list_if(MSVC /DEBUG HWASAN_DYNAMIC_LINK_FLAGS) 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} LIBS ${hwasan_runtime}-${arch} ${hwasan_runtime}_cxx-${arch}
EXTRA hwasan.syms.extra) EXTRA hwasan.syms.extra)
set(VERSION_SCRIPT_FLAG set(VERSION_SCRIPT_FLAG