Skip to content
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

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

dstolfa
Copy link
Contributor

@dstolfa dstolfa commented Jun 5, 2024

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).

@dstolfa dstolfa changed the base branch from main to dev June 5, 2024 17:09
@dstolfa dstolfa requested review from jrtc27 and bsdjhb June 5, 2024 17:11
@jrtc27
Copy link
Member

jrtc27 commented Jun 5, 2024

Hm, this file shouldn't really have been messed about with until also landing the changes to libunwind itself

@@ -54,6 +54,10 @@ SRCS+= s_scalbnl.c
.endif

SYMBOL_MAPS+= ${.CURDIR}/Symbol-c18n.map
Copy link
Member

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?

Copy link
Contributor Author

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?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sounds about right

@dstolfa dstolfa force-pushed the libgccs-aarch64-only branch 2 times, most recently from 0376053 to d57e168 Compare June 5, 2024 17:29
Copy link
Member

@brooksdavis brooksdavis left a 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.

@dstolfa dstolfa force-pushed the libgccs-aarch64-only branch from d57e168 to ea5851b Compare June 6, 2024 10:57
@dstolfa
Copy link
Contributor Author

dstolfa commented Jun 6, 2024

There's an argument for making the libexec/rtld-elf/Makefile style change in a separate commit, but this should work.

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.

@brooksdavis brooksdavis merged commit f03092d into dev Jun 7, 2024
29 checks passed
@brooksdavis brooksdavis deleted the libgccs-aarch64-only branch June 7, 2024 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants