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

Fix trampoline assembly for build on clang 18 on apple silicon (#54634) #199

Merged
merged 1 commit into from
Nov 19, 2024

Conversation

Drvi
Copy link
Member

@Drvi Drvi commented Nov 19, 2024

This avoids a: error: non-private labels cannot appear between .cfi_startproc / .cfi_endproc pairs error.
That error was introduced in https://reviews.llvm.org/D155245#4657075 see also llvm/llvm-project#72802

(cherry picked from commit a4e793e) (cherry picked from commit 3f35094)

PR Description

What does this PR do?

Checklist

Requirements for merging:

…Lang#54634)

This avoids a: `error: non-private labels cannot appear between
.cfi_startproc / .cfi_endproc pairs` error.
That error was introduced in https://reviews.llvm.org/D155245#4657075
see also llvm/llvm-project#72802

(cherry picked from commit a4e793e)
(cherry picked from commit 3f35094)
@github-actions github-actions bot added port-to-v1.10 This change should apply to Julia v1.10 builds port-to-master This change should apply to all future Julia builds labels Nov 19, 2024
@Drvi Drvi requested review from rbvermaa and d-netto November 19, 2024 13:40
@d-netto
Copy link
Member

d-netto commented Nov 19, 2024

Could you provide some higher-level context on why we are backporting this?

I.e. does this fixe any bug related to building raicode with PackageCompiler on Apple silicon? (That's what I imagine...)

@Drvi
Copy link
Member Author

Drvi commented Nov 19, 2024

@d-netto Sorry, here is a slack thread for context: https://relationalai.slack.com/archives/C04J1BRVD40/p1731383171631329

TL;DR: with newer clang that came with the recent Sonoma upgrade, we couldn't get Julia 1.10.2 or 1.10.2+RAI to build on Apple silicon (they fixed it in Julia 1.10.5)

Copy link
Member

@d-netto d-netto left a comment

Choose a reason for hiding this comment

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

SGTM.

Please open a raicode PR and check the other boxes before merging.

@Drvi Drvi removed port-to-v1.10 This change should apply to Julia v1.10 builds port-to-master This change should apply to all future Julia builds labels Nov 19, 2024
@Drvi Drvi merged commit 5610223 into v1.10.2+RAI Nov 19, 2024
7 checks passed
@Drvi Drvi deleted the td-backport-54634 branch November 19, 2024 17:13
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