Skip to content

release/21.x: [libunwind] fix building on Haiku i386 (#171586) #171754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
llvmbot wants to merge 2 commits into
base: release/21.x
Choose a base branch
from
Open

release/21.x: [libunwind] fix building on Haiku i386 (#171586) #171754

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0108531
[libunwind] fix building on Haiku i386 (#171586)
brad0 Dec 11, 2025
f8a68f6
Merge branch 'release/21.x' into issue171753
brad0 Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions libunwind/src/UnwindCursor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
};
Expand Down
Loading