From 3bca1f47a906815bfceef9b5184eb4001a9c49b6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 9 Sep 2021 10:04:30 +0200 Subject: [PATCH] revert disable-no-omit-leaf.diff, fixed upstream --- debian/patches/disable-no-omit-leaf.diff | 18 ------------------ debian/patches/series | 1 - 2 files changed, 19 deletions(-) delete mode 100644 debian/patches/disable-no-omit-leaf.diff diff --git a/debian/patches/disable-no-omit-leaf.diff b/debian/patches/disable-no-omit-leaf.diff deleted file mode 100644 index 8baef1d5..00000000 --- a/debian/patches/disable-no-omit-leaf.diff +++ /dev/null @@ -1,18 +0,0 @@ -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 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