llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-libunwind Author: Louis Dionne (ldionne) <details> <summary>Changes</summary> 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. --- Full diff: https://github.com/llvm/llvm-project/pull/172507.diff 2 Files Affected: - (modified) libunwind/src/Unwind-sjlj.c (-4) - (modified) libunwind/src/config.h (+2-6) ``````````diff 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 `````````` </details> https://github.com/llvm/llvm-project/pull/172507 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
