diff --git a/debian/changelog b/debian/changelog index 2aa567d5..9847fc83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +llvm-toolchain-13 (1:13.0.0~+rc2-4) unstable; urgency=medium + + * Remove debian/patches/disable-no-omit-leaf.diff to unbreak + apt.llvm.org + Will be fixed in rc3 + If rc2 needs an upload, please revert this commit + + -- Sylvestre Ledru Sat, 11 Sep 2021 09:48:23 +0200 + llvm-toolchain-13 (1:13.0.0~+rc2-3) unstable; urgency=medium * compiler-rt scudo, don't add the option diff --git a/debian/patches/disable-no-omit-leaf.diff b/debian/patches/disable-no-omit-leaf.diff deleted file mode 100644 index 37ec48b4..00000000 --- a/debian/patches/disable-no-omit-leaf.diff +++ /dev/null @@ -1,30 +0,0 @@ -commit f53652203e4974eac67d2e409650c3f22909d7e2 -Author: Tom Stellard -Date: Wed Sep 8 21:10:38 2021 -0700 - - scudo: Only add no-omit-frame-pointer flags when the compiler supports them - - Reviewed By: cryptoad - - Differential Revision: https://reviews.llvm.org/D109196 - - (cherry picked from commit 9ee64c374605683ae80b9641d5312a72c2a67336) - -diff --git a/compiler-rt/lib/scudo/standalone/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/CMakeLists.txt -index 8c3708d3a45f..d6ffa448d7e0 100644 ---- a/compiler-rt/lib/scudo/standalone/CMakeLists.txt -+++ b/compiler-rt/lib/scudo/standalone/CMakeLists.txt -@@ -124,8 +124,11 @@ if (COMPILER_RT_HAS_GWP_ASAN) - RTGwpAsan RTGwpAsanBacktraceLibc RTGwpAsanSegvHandler - RTGwpAsanOptionsParser) - -- list(APPEND SCUDO_CFLAGS -DGWP_ASAN_HOOKS -fno-omit-frame-pointer -- -mno-omit-leaf-frame-pointer) -+ append_list_if(COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG -fno-omit-frame-pointer -+ -mno-omit-leaf-frame-pointer -+ SCUDO_CFLAGS) -+ list(APPEND SCUDO_CFLAGS -DGWP_ASAN_HOOKS) -+ - endif() - - set(SCUDO_LINK_LIBS) diff --git a/debian/patches/series b/debian/patches/series index ba3789e2..18336ab6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -145,4 +145,3 @@ scan-build-py-fix-default-bin.diff libclc-llvm-spirv.diff omp-riscv64.patch -disable-no-omit-leaf.diff