https://github.com/brad0 updated https://github.com/llvm/llvm-project/pull/171754
>From 01085318abfec9d8d1828877b4ec1f9b14efb68b Mon Sep 17 00:00:00 2001 From: Brad Smith <[email protected]> Date: Wed, 10 Dec 2025 21:27:21 -0500 Subject: [PATCH] [libunwind] fix building on Haiku i386 (#171586) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jérôme Duval <[email protected]> (cherry picked from commit 3fdce799cc184bf1b7c60a6845026df6c6e7630b) --- libunwind/src/UnwindCursor.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp index 9a1afd3721f5a..1dcf2e14da851 100644 --- a/libunwind/src/UnwindCursor.hpp +++ b/libunwind/src/UnwindCursor.hpp @@ -41,7 +41,8 @@ #define _LIBUNWIND_CHECK_LINUX_SIGRETURN 1 #endif -#if defined(_LIBUNWIND_TARGET_HAIKU) && defined(_LIBUNWIND_TARGET_X86_64) +#if defined(_LIBUNWIND_TARGET_HAIKU) && \ + (defined(_LIBUNWIND_TARGET_I386) || defined(_LIBUNWIND_TARGET_X86_64)) #include <OS.h> #include <signal.h> #define _LIBUNWIND_CHECK_HAIKU_SIGRETURN 1 @@ -1345,7 +1346,7 @@ class UnwindCursor : public AbstractUnwindCursor{ bool _unwindInfoMissing; bool _isSignalFrame; #if defined(_LIBUNWIND_CHECK_LINUX_SIGRETURN) || \ - defined(_LIBUNWIND_TARGET_HAIKU) + defined(_LIBUNWIND_CHECK_HAIKU_SIGRETURN) bool _isSigReturn = false; #endif }; _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
