[LLVM17] Adapt to ExplicitEmulatedTLS removal.
#110755
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
|
r? @cuviper (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
bors r+ |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 25, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#110563 (Break up long function in trait selection error reporting + clean up nearby code) - rust-lang#110755 ([LLVM17] Adapt to `ExplicitEmulatedTLS` removal.) - rust-lang#110775 (Update books) - rust-lang#110779 (configure.py: add flag for riscv{64,32}gc musl-root) - rust-lang#110782 (Revert panic oom) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
llvm/llvm-project@0d333bf removed the
ExplicitEmulatedTLSfield fromTargetOptions.Before that commit,
TargetMachine::useEmulatedTLS()fell back toTheTriple.hasDefaultEmulatedTLS()ifExplicitEmulatedTLSwasfalse/unset.After that commit,
TargetMachine::useEmulatedTLS()directly returnsOptions.EmulatedTLS, and the fallback toTheTriple.hasDefaultEmulatedTLS()was moved toInitTargetOptionsFromCodeGenFlags.Since
rustcdoes not useInitTargetOptionsFromCodeGenFlags(AFAICT) and instead manually buildsTargetOptions, this PR initializesEmulatedTLStoTheTriple.hasDefaultEmulatedTLS().(I'm not really familiar with the details of what this option does, or if there are any tests that depend on
hasDefaultEmulatedTLSbeing used correctly, so this PR is mostly untested (it does compile against LLVM17, though)).@rustbot label: +llvm-main