From 18c8934a0f6a41fc9523b5e9192bb7fc9747337e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 2 Sep 2021 15:29:01 +0200 Subject: [PATCH 1/3] prepare for upload --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e6303de6..a709d083 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-13 (1:13.0.0~+rc2-2) UNRELEASED; urgency=medium +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 From 244753c933561ada998009f435f171e88d748fe5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 2 Sep 2021 21:36:20 +0200 Subject: [PATCH 2/3] compiler-rt scudo, don't add the option -mno-omit-leaf-frame-pointer when building on armel & armhf --- debian/changelog | 8 ++++++++ debian/patches/disable-no-omit-leaf.diff | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+) create mode 100644 debian/patches/disable-no-omit-leaf.diff diff --git a/debian/changelog b/debian/changelog index a709d083..f8719013 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 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 diff --git a/debian/patches/disable-no-omit-leaf.diff b/debian/patches/disable-no-omit-leaf.diff new file mode 100644 index 00000000..8baef1d5 --- /dev/null +++ b/debian/patches/disable-no-omit-leaf.diff @@ -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) diff --git a/debian/patches/series b/debian/patches/series index 18336ab6..ba3789e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -145,3 +145,4 @@ scan-build-py-fix-default-bin.diff libclc-llvm-spirv.diff omp-riscv64.patch +disable-no-omit-leaf.diff From 813bc15420531c00ed62a8fc7091c6a2068a0692 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 4 Sep 2021 14:20:53 +0200 Subject: [PATCH 3/3] bring back CMAKE_EXTRA in the main cmake call - it was causing https://github.com/opencollab/llvm-toolchain-integration-test-suite/issues/64 --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 5e7623e3..beba165f 100755 --- a/debian/rules +++ b/debian/rules @@ -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 \