proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-10-29 19:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cherry-pick upstream package to replace my ugly patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2021-09-10 14:15:49 +02:00
parent 4dcf863ff4
commit 52131e56dc
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
debian/patches/disable-no-omit-leaf.diff vendored
View File

@ -1,18 +1,30 @@
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
commit f53652203e4974eac67d2e409650c3f22909d7e2
Author: Tom Stellard <tstellar@redhat.com>
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)
+ 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()
+ 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)