From be61b9493d38032519e596f282f9695667402c8d Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 26 Mar 2025 17:46:40 +0100 Subject: [PATCH] support: Use unwinder in links-dso-program-c only with libgcc_s Do not build links-dso-program-c with exception (unwinding) support if libgcc_s is not available. In this case, the unwinder may be part of libgcc.a or libgcc_eh.a, depending on how GCC was built. If the unwinder is in libgcc_eh.a only, linking links-dso-program-c failed before this change. After this change, the exception handling landing pad is only generated if libgcc_s available, avoiding an undefined _Unwind_Resume (or equivalent) symbol reference in the non-libgcc_s case. Fixes commit ffd36cc27407003a6f9efcb9c16370e3435c5b1d ("support: Use unwinder in links-dso-program-c only with libgcc_s") and commit 5dfbc3c43ecc1bcfc760a032c91bb002660051bc ("support: Link links-dso-program-c with libgcc_s only if available"). --- support/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/Makefile b/support/Makefile index ea7b4cd4a0..dfe8e547f6 100644 --- a/support/Makefile +++ b/support/Makefile @@ -281,9 +281,9 @@ CFLAGS-temp_file.c += -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 ifeq (,$(CXX)) LINKS_DSO_PROGRAM = links-dso-program-c -CFLAGS-links-dso-program-c.c += -fexceptions LDLIBS-links-dso-program-c = -lgcc ifeq ($(have-libgcc_s),yes) +CFLAGS-links-dso-program-c.c += -fexceptions LDLIBS-links-dso-program-c += -lgcc_s $(libunwind) endif else