From a4f6bfe30406d2ec0050807c73a836d027ed4be5 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 19 Apr 2024 22:45:05 +0100 Subject: libgcc_{eh,s}: restore __*_frame_info symbols post llvm18 The upstream llvm commit 5eb44df1b64d made the addition of these GCC compatability symbols dependent on build configuration rather than hardcoded for amd64, i386, and powerpc. Reenable them. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D44877 (cherry picked from commit 0b9e3585805e83718c3ebdab923aca51597193cd) --- lib/libgcc_eh/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/libgcc_eh') diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 9e194cc875f1..75e7d743a720 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -17,6 +17,9 @@ SRCS_EXC+= UnwindRegistersSave.S SRCS_EXC+= libunwind.cpp SRCS+= ${SRCS_EXC} +.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "powerpc" +CFLAGS.UnwindLevel1-gcc-ext.c+= -D_LIBUNWIND_SUPPORT_FRAME_APIS +.endif .for file in ${SRCS_EXC:M*.c} CFLAGS.${file}+= -fno-exceptions -funwind-tables .if ${MK_ASAN} != "no" -- cgit v1.3