-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[SR-648] Add option to create statically linked binaries (take 2) #5394
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
jckarter
merged 4 commits into
swiftlang:master
from
spevans:pr_libicu_with_static_executable
Nov 30, 2016
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| //===-- ImageInspectionStatic.cpp -------------------------------*- C++ -*-===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2016 Apple Inc. and the Swift project authors | ||
| // Licensed under Apache License v2.0 with Runtime Library Exception | ||
| // | ||
| // See http://swift.org/LICENSE.txt for license information | ||
| // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // Implementation of functions to read data sections from static executable. | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #include "ImageInspection.h" | ||
| #include <cstring> | ||
|
|
||
| // Currently only tested on linux but should work for any ELF platform | ||
| #if defined(__ELF__) && defined(__linux__) | ||
|
|
||
| // These are defined in swift_sections.S to mark the start of a section with the | ||
| // length of the data followed immediately by the section data | ||
| struct alignas(uint64_t) Section; | ||
| extern const Section protocolConformancesStart asm(".swift2_protocol_conformances_start"); | ||
| extern const Section typeMetadataStart asm(".swift2_type_metadata_start"); | ||
|
|
||
| struct SectionInfo { | ||
| uint64_t size; | ||
| const char *data; | ||
| }; | ||
|
|
||
| static SectionInfo | ||
| getSectionInfo(const Section *section) { | ||
| SectionInfo info; | ||
| memcpy(&info.size, section, sizeof(uint64_t)); | ||
| info.data = reinterpret_cast<const char *>(section) + sizeof(uint64_t); | ||
| return info; | ||
| } | ||
|
|
||
| void | ||
| swift::initializeProtocolConformanceLookup() { | ||
| auto protocolConformances = getSectionInfo(&protocolConformancesStart); | ||
| addImageProtocolConformanceBlockCallback(protocolConformances.data, | ||
| protocolConformances.size); | ||
| } | ||
|
|
||
| void | ||
| swift::initializeTypeMetadataRecordLookup() { | ||
| auto typeMetadata = getSectionInfo(&typeMetadataStart); | ||
| addImageTypeMetadataRecordBlockCallback(typeMetadata.data, | ||
| typeMetadata.size); | ||
| } | ||
|
|
||
| // This is called from Errors.cpp when dumping a stack trace entry. | ||
| // It could be implemented by parsing the ELF information in the | ||
| // executable. For now it returns 0 for error (cant lookup address). | ||
| int | ||
| swift::lookupSymbol(const void *address, SymbolInfo *info) { | ||
| return 0; | ||
| } | ||
|
|
||
| #endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't
ImageInspectionELF.cppincluded in the coreswift_runtime_sourcesabove?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When compiling for Linux it is removed from swift_runtime_sources so that it is not added to libswiftCore.a but instead used in libswiftImageInspectionShared.a
For other ELF targets it remains in swift_runtime_source - this may change as this static option is tested on other ELF targets