0011-compiler-rt-HACK-always-compile-in-gcc_personality_v.patch (1659B)
1 From 89eaf55d6533d180e6eb9b58f36f19e70c1c03e4 Mon Sep 17 00:00:00 2001 2 From: q66 <q66@chimera-linux.org> 3 Date: Sat, 4 Nov 2023 09:04:56 +0100 4 Subject: [PATCH 11/29] compiler-rt: HACK: always compile in gcc_personality_v0 5 6 Looks like HAVE_UNWIND_H is not accounted for when doing the 7 runtimes build, but this is the only place where it's checked. 8 9 Unconditionally compile it in because some things use it. 10 --- 11 compiler-rt/lib/builtins/CMakeLists.txt | 10 ++++------ 12 compiler-rt/lib/builtins/gcc_personality_v0.c | 2 +- 13 2 files changed, 5 insertions(+), 7 deletions(-) 14 15 diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt 16 index 51f59457a..20e4a6eb9 100644 17 --- a/compiler-rt/lib/builtins/CMakeLists.txt 18 +++ b/compiler-rt/lib/builtins/CMakeLists.txt 19 @@ -227,12 +227,10 @@ if(APPLE) 20 ) 21 endif() 22 23 -if (HAVE_UNWIND_H) 24 - set(GENERIC_SOURCES 25 - ${GENERIC_SOURCES} 26 - gcc_personality_v0.c 27 - ) 28 -endif () 29 +set(GENERIC_SOURCES 30 + ${GENERIC_SOURCES} 31 + gcc_personality_v0.c 32 +) 33 34 if (NOT FUCHSIA) 35 set(GENERIC_SOURCES 36 diff --git a/compiler-rt/lib/builtins/gcc_personality_v0.c b/compiler-rt/lib/builtins/gcc_personality_v0.c 37 index ef63a5fb8..5a0a90b38 100644 38 --- a/compiler-rt/lib/builtins/gcc_personality_v0.c 39 +++ b/compiler-rt/lib/builtins/gcc_personality_v0.c 40 @@ -9,7 +9,7 @@ 41 #include "int_lib.h" 42 #include <stddef.h> 43 44 -#include <unwind.h> 45 +#include "../../../libunwind/include/unwind.h" 46 #if defined(__arm__) && !defined(__ARM_DWARF_EH__) && \ 47 !defined(__USING_SJLJ_EXCEPTIONS__) 48 // When building with older compilers (e.g. clang <3.9), it is possible that we 49 -- 50 2.49.0 51