diff options
| author | bors <bors@rust-lang.org> | 2023-04-25 04:58:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-25 04:58:54 +0000 |
| commit | ed3ddb375bf18099a885605efba94dc1e50379d7 (patch) | |
| tree | 66afe302b8efddeef9f8a787ab8c97f1e7d74102 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | f6830a212973ced91a047cee86cb79cee4f23868 (diff) | |
| parent | 2d72abc8f24d0af3b0344cbee14130eaaf90f75f (diff) | |
| download | rust-ed3ddb375bf18099a885605efba94dc1e50379d7.tar.gz rust-ed3ddb375bf18099a885605efba94dc1e50379d7.zip | |
Auto merge of #110789 - matthiaskrgr:rollup-92e764u, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #110563 (Break up long function in trait selection error reporting + clean up nearby code)
- #110755 ([LLVM17] Adapt to `ExplicitEmulatedTLS` removal.)
- #110775 (Update books)
- #110779 (configure.py: add flag for riscv{64,32}gc musl-root)
- #110782 (Revert panic oom)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index 90cce9a8650..1acdc95ca8d 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -410,10 +410,15 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine( } Options.RelaxELFRelocations = RelaxELFRelocations; Options.UseInitArray = UseInitArray; + +#if LLVM_VERSION_LT(17, 0) if (ForceEmulatedTls) { Options.ExplicitEmulatedTLS = true; Options.EmulatedTLS = true; } +#else + Options.EmulatedTLS = ForceEmulatedTls || Trip.hasDefaultEmulatedTLS(); +#endif if (TrapUnreachable) { // Tell LLVM to codegen `unreachable` into an explicit trap instruction. |