Skip to content

Add a SWIFT_RUNTIME_MACHO_NO_DYLD stdlib mode that doesn't dynamically look up sections in modules, and only assumes a single static module #33441

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
Aug 18, 2020
Merged

Add a SWIFT_RUNTIME_MACHO_NO_DYLD stdlib mode that doesn't dynamically look up sections in modules, and only assumes a single static module #33441

merged 2 commits into from
Aug 18, 2020

Conversation

@kubamracek
Copy link
Contributor

@kubamracek kubamracek commented Aug 13, 2020

No description provided.

@kubamracek kubamracek requested a review from mikeash August 13, 2020 01:04
mikeash
mikeash reviewed Aug 13, 2020
View reviewed changes
@kubamracek
Copy link
Contributor Author

kubamracek commented Aug 16, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Aug 16, 2020

Build failed
Swift Test Linux Platform
Git Sha - 1beec2645d0bb9a484cdb91338d411610e3f1cd6

@swift-ci
Copy link
Contributor

swift-ci commented Aug 16, 2020

Build failed
Swift Test OS X Platform
Git Sha - 1beec2645d0bb9a484cdb91338d411610e3f1cd6

@jckarter
Copy link
Contributor

jckarter commented Aug 16, 2020

Instead of #ifdef-ing half of ImageInspectionMachO, maybe this variant could be put in its own ImageInspectionStatic.cpp file. It would also be useful to do this for static executables on Linux.

@kubamracek
Copy link
Contributor Author

kubamracek commented Aug 17, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Aug 17, 2020

Build failed
Swift Test OS X Platform
Git Sha - 1beec2645d0bb9a484cdb91338d411610e3f1cd6

@swift-ci
Copy link
Contributor

swift-ci commented Aug 17, 2020

Build failed
Swift Test Linux Platform
Git Sha - 1beec2645d0bb9a484cdb91338d411610e3f1cd6

@kubamracek
Add a SWIFT_RUNTIME_MACHO_NO_DYLD stdlib mode that doesn't dynamicall…
e2f1e55 
…y look up sections in modules, and only assumes a single static module
@kubamracek
Copy link
Contributor Author

kubamracek commented Aug 17, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Aug 17, 2020

Build failed
Swift Test OS X Platform
Git Sha - 1564b5449002e1e67218592b22fb4ea7a6616e66

@swift-ci
Copy link
Contributor

swift-ci commented Aug 17, 2020

Build failed
Swift Test Linux Platform
Git Sha - 1564b5449002e1e67218592b22fb4ea7a6616e66

@kubamracek
Copy link
Contributor Author

kubamracek commented Aug 18, 2020

@jckarter I've introduced the ImageInspectionStatic.cpp file instead of changing ImageInspectionMacho.cpp. Would you take another look now?

mikeash
mikeash reviewed Aug 18, 2020
View reviewed changes
stdlib/public/runtime/ImageInspectionStatic.cpp Outdated
@@ -0,0 +1,77 @@
//===--- ImageInspectionMachO.cpp - Mach-O image inspection ---------------===//
Copy link
Contributor

@mikeash mikeash Aug 18, 2020

Choose a reason for hiding this comment

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

Still has the old name and short description.

@mikeash
Copy link
Contributor

mikeash commented Aug 18, 2020

Thanks to both of you, this approach looks much nicer.

@kubamracek
Copy link
Contributor Author

kubamracek commented Aug 18, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Aug 18, 2020

Build failed
Swift Test Linux Platform
Git Sha - e2f1e55

@swift-ci
Copy link
Contributor

swift-ci commented Aug 18, 2020

Build failed
Swift Test OS X Platform
Git Sha - e2f1e55

jckarter
jckarter approved these changes Aug 18, 2020
View reviewed changes
Copy link
Contributor

@jckarter jckarter left a comment

Choose a reason for hiding this comment

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

Looks much nicer this way. Thanks @kubamracek !

@kubamracek kubamracek merged commit db18dea into swiftlang:master Aug 18, 2020
@kubamracek kubamracek deleted the macho-no-dyld branch August 18, 2020 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mikeash mikeash mikeash approved these changes

@jckarter jckarter jckarter approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kubamracek @swift-ci @jckarter @mikeash