https://github.com/ldionne created https://github.com/llvm/llvm-project/pull/172507
This hasn't been needed for many years, and in fact we've removed that code in Apple's fork of LLVM. This patch simply cleans up that code from upstream. >From 6b1033007359fee38473f4df9a6da2b6c954e31a Mon Sep 17 00:00:00 2001 From: Louis Dionne <[email protected]> Date: Tue, 16 Dec 2025 10:56:19 -0500 Subject: [PATCH] [libunwind] Remove code related to dyld from libunwind This hasn't been needed for many years, and in fact we've removed that code in Apple's fork of LLVM. This patch simply cleans up that code from upstream. --- libunwind/src/Unwind-sjlj.c | 4 ---- libunwind/src/config.h | 8 ++------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libunwind/src/Unwind-sjlj.c b/libunwind/src/Unwind-sjlj.c index a3551b328950d..0cc31116df507 100644 --- a/libunwind/src/Unwind-sjlj.c +++ b/libunwind/src/Unwind-sjlj.c @@ -74,8 +74,6 @@ struct _Unwind_FunctionContext { #endif -#if !defined(FOR_DYLD) - #if defined(__APPLE__) #include <System/pthread_machdep.h> #else @@ -100,8 +98,6 @@ __Unwind_SjLj_SetTopOfFunctionStack(struct _Unwind_FunctionContext *fc) { #endif } -#endif - /// Called at start of each function that catches exceptions _LIBUNWIND_EXPORT void diff --git a/libunwind/src/config.h b/libunwind/src/config.h index f017403fa2234..8730d6004f7bf 100644 --- a/libunwind/src/config.h +++ b/libunwind/src/config.h @@ -22,12 +22,8 @@ // Platform specific configuration defines. #ifdef __APPLE__ - #if defined(FOR_DYLD) - #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 1 - #else - #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 1 - #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 1 - #endif + #define _LIBUNWIND_SUPPORT_COMPACT_UNWIND 1 + #define _LIBUNWIND_SUPPORT_DWARF_UNWIND 1 #if defined(__aarch64__) || defined(__arm64__) || defined(__arm64e__) #define _LIBUNWIND_TRACE_RET_INJECT 1 #endif _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
