Skip to content

Adjust to simulator compiler-rt change #33148

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

Merged
merged 2 commits into from
Jul 28, 2020

Conversation

beccadax
Copy link
Contributor

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://66192830.

beccadax added 2 commits July 27, 2020 18:21
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.
The previous commit makes various simulator-specific platform helpers dead code. Remove them.
@beccadax
Copy link
Contributor Author

@swift-ci please test

@beccadax beccadax requested a review from hyp July 28, 2020 01:32
@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 86ff24b

@beccadax
Copy link
Contributor Author

@swift-ci please test macOS platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 86ff24b

Copy link
Contributor

@hyp hyp left a comment

Choose a reason for hiding this comment

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

LGTM

@beccadax
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 86ff24b

@beccadax
Copy link
Contributor Author

Failure appears to be the sporadic SR-13302.

@swift-ci please test macOS platform

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