Merge remote-tracking branch 'origin/13' into snapshot

This commit is contained in:
Sylvestre Ledru 2021-09-04 14:22:00 +02:00
commit f2a41afbc6
4 changed files with 29 additions and 1 deletions

10
debian/changelog vendored
View File

@ -58,7 +58,15 @@ llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; ur
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 06 Aug 2021 08:40:58 +0200
llvm-toolchain-13 (1:13.0.0~+rc2-2) UNRELEASED; urgency=medium
llvm-toolchain-13 (1:13.0.0~+rc2-3) UNRELEASED; urgency=medium
* compiler-rt scudo, don't add the option
-mno-omit-leaf-frame-pointer when building on
armel & armhf
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 02 Sep 2021 21:35:26 +0200
llvm-toolchain-13 (1:13.0.0~+rc2-2) unstable; urgency=medium
* Build with -DCMAKE_POSITION_INDEPENDENT_CODE=ON to libc++ and libc++abi
* The changes from 12.0.1-7

View File

@ -0,0 +1,18 @@
Index: llvm-toolchain-13-13.0.0~+rc2/compiler-rt/lib/scudo/standalone/CMakeLists.txt
===================================================================
--- llvm-toolchain-13-13.0.0~+rc2.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+++ llvm-toolchain-13-13.0.0~+rc2/compiler-rt/lib/scudo/standalone/CMakeLists.txt
@@ -123,9 +123,10 @@ if (COMPILER_RT_HAS_GWP_ASAN)
list(APPEND SCUDO_OBJECT_LIBS
RTGwpAsan RTGwpAsanBacktraceLibc RTGwpAsanSegvHandler
RTGwpAsanOptionsParser)
-
- list(APPEND SCUDO_CFLAGS -DGWP_ASAN_HOOKS -fno-omit-frame-pointer
- -mno-omit-leaf-frame-pointer)
+ if (NOT ${arch} STREQUAL "armhf" AND NOT ${arch} STREQUAL "armel")
+ list(APPEND SCUDO_CFLAGS -DGWP_ASAN_HOOKS -fno-omit-frame-pointer
+ -mno-omit-leaf-frame-pointer)
+ endif()
endif()
set(SCUDO_LINK_LIBS)

View File

@ -145,3 +145,4 @@ scan-build-py-fix-default-bin.diff
libclc-llvm-spirv.diff
omp-riscv64.patch
disable-no-omit-leaf.diff

1
debian/rules vendored
View File

@ -430,6 +430,7 @@ override_dh_auto_configure: preconfigure
-DENABLE_LINKER_BUILD_ID=ON \
-DCOMPILER_RT_USE_LIBCXX=NO \
-DLIBUNWIND_USE_COMPILER_RT=ON \
$(CMAKE_EXTRA) \
$(Z3_FLAG) \
-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR;M68k" \
-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \