Skip to content

[5.3] Adjust to simulator compiler-rt change #33173

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

Jump to bottom
Merged
merged 2 commits into from
Jul 29, 2020
Merged

[5.3] Adjust to simulator compiler-rt change #33173

merged 2 commits into from
Jul 29, 2020

Conversation

beccadax
Copy link
Contributor

Cherry-picks #33148 to release/5.3 branch:

Previously, we packaged both the device and simulator versions of compiler-rt in a single static archive, relying on the fact that they used different architectures to differentiate between them. But Apple Silicon is now here to make us repay this technical debt. swiftlang/llvm-project#1553 separated the simulator versions of compiler-rt into libraries with different names; this PR adjusts Swift to match.

Fixes rdar://66060312.

beccadax added 2 commits July 27, 2020 18:35
@beccadax
Adjust to simulator compiler_rt change
b982f61 
The compiler_rt static library for iOS simulator is now packaged in a separate static archive from the one for iOS devices. Adjust linker invocation to match.

Fixes rdar://66192830 / rdar://66060312.
@beccadax
[NFC] Clean up unused simulator special cases
377c17c 
The previous commit makes various simulator-specific platform helpers dead code. Remove them.
@beccadax beccadax requested a review from a team as a code owner July 28, 2020 23:46
@beccadax beccadax requested a review from hyp July 28, 2020 23:46
@beccadax
Copy link
Contributor Author

@swift-ci please test

@beccadax beccadax added the r5.3 label Jul 28, 2020
@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 377c17c

@beccadax
Copy link
Contributor Author

@swift-ci please test Linux platform

@beccadax beccadax merged commit f651666 into swiftlang:release/5.3 Jul 29, 2020
@AnthonyLatsis AnthonyLatsis added swift 5.3 🍒 release cherry pick Flag: Release branch cherry picks labels Jan 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DougGregor DougGregor DougGregor approved these changes

@hyp hyp Awaiting requested review from hyp

Assignees
No one assigned
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 5.3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@beccadax @swift-ci @DougGregor @AnthonyLatsis