https://github.com/brad0 created https://github.com/llvm/llvm-project/pull/171586
None >From fc4191b49688dc53fa9a59b3d98284c927da4567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <[email protected]> Date: Wed, 10 Dec 2025 04:10:15 -0500 Subject: [PATCH] [libunwind] fix building on Haiku i386 --- 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 33fcd841b2ab0..afa0cae790377 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 @@ -1366,7 +1367,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 #ifdef _LIBUNWIND_TRACE_RET_INJECT _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
