-
Notifications
You must be signed in to change notification settings - Fork 61
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.
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
Guard -D_LIBUNWIND_SANDBOX_OTYPES behind an aarch64 check #2107
Conversation
Hm, this file shouldn't really have been messed about with until also landing the changes to libunwind itself |
lib/libgcc_s/Makefile
Outdated
@@ -54,6 +54,10 @@ SRCS+= s_scalbnl.c | |||
.endif | |||
|
|||
SYMBOL_MAPS+= ${.CURDIR}/Symbol-c18n.map |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is wrong for non-c18n?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What would the best way to check for this be? The rtld Makefile seems to check for purecap + aarch64. Is that sufficient?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That sounds about right
0376053
to
d57e168
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's an argument for making the libexec/rtld-elf/Makefile style change in a separate commit, but this should work.
d57e168
to
ea5851b
Compare
It wasn't actually my intention to make changes to the rtld Makefile, it was an accident since I was just copying over what rtld was doing to check for c18n, but might as well :). I broke it out into a separate commit. |
With recent changes in CTSRD-CHERI/llvm-project#731, we need to guard these libunwind defines behind aarch64 to avoid breaking other archs (like CHERI-RISC-V).