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

Use tpidrro_el0 for thread local storage in macOS-arm64 #346

Merged
merged 3 commits into from
Jan 29, 2021

Conversation

xhochy
Copy link
Contributor

@xhochy xhochy commented Dec 30, 2020

Fixes #343

@@ -707,7 +707,11 @@ static inline void* mi_tls_slot(size_t slot) mi_attr_noexcept {
res = tcb[slot];
#elif defined(__aarch64__)
void** tcb; UNUSED(ofs);
#if defined(__MACH__)
Copy link

Choose a reason for hiding this comment

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

__APPLE__ not __MACH__; the latter includes things like GNU Mach

@vespakoen
Copy link

Just want to confirm that this PR is working for me.

There is still a #if defined(__MACH__) on line 737 though, I guess this also has to be replaced with __APPLE__?

@daanx
Copy link
Collaborator

daanx commented Jan 29, 2021

Ah, this is very cool -- thanks so much @xhochy !

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.

4 participants