The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0b9e3585805e83718c3ebdab923aca51597193cd
commit 0b9e3585805e83718c3ebdab923aca51597193cd Author: Brooks Davis <[email protected]> AuthorDate: 2024-04-19 21:45:05 +0000 Commit: Brooks Davis <[email protected]> CommitDate: 2024-04-19 21:56:13 +0000 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 --- lib/libgcc_eh/Makefile.inc | 3 +++ 1 file changed, 3 insertions(+) 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"
