Windows triple normalization #80
Merged
Conversation
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
merge upstream
merge upstream
merge upstream
sjavora
commented
Mar 1, 2020
| parsedEnv.substring.starts(with: "androideabi") { | ||
| let androidVersion = parsedEnv.substring.dropFirst("androideabi".count) | ||
|
|
||
| parser.components[3] = "android\(androidVersion)" |
There was a problem hiding this comment.
There is no test for this - I didn't find one in TripleTest.cpp and I don't really know what a "valid" triple like this would look like.
|
@swift-ci please test |
aciidgh
reviewed
Mar 5, 2020
aciidgh
reviewed
Mar 5, 2020
aciidgh
reviewed
Mar 5, 2020
aciidgh
reviewed
Mar 5, 2020
aciidgh
reviewed
Mar 5, 2020
aciidgh
reviewed
Mar 5, 2020
aciidgh
approved these changes
Mar 5, 2020
sjavora
force-pushed
the
triple-normalization-upgrade
branch
from
e4219c9 to
3d096a4
Compare
|
Updated. |
|
@swift-ci test |
1 similar comment
|
@swift-ci test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Adds logic from
llvm::Triple::normalize, which enables all the asserts fromtestNormalizeWindowsas well as some other edge cases.Notably,
objectFormatfor some Windows triples still doesn't parse. As far as I can tell, this is becauseTriple.EnvInfochecks for both environment and object format in the fourth position, so in strings likei686-pc-windows-msvc-elf, theelfis just totally ignored.