diff options
| author | bors <bors@rust-lang.org> | 2023-03-29 07:16:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-29 07:16:16 +0000 |
| commit | f346fb0bc655acf72e71f1f16065c271447bdbd9 (patch) | |
| tree | 12ee0966b519561621373db1b6d6904e4a41eb90 /compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | |
| parent | 40cd0310db7f67867b305c28fb87b5b660e77df1 (diff) | |
| parent | e3968be331aaf7fa48f2365998ed4d076ddc82c8 (diff) | |
| download | rust-f346fb0bc655acf72e71f1f16065c271447bdbd9.tar.gz rust-f346fb0bc655acf72e71f1f16065c271447bdbd9.zip | |
Auto merge of #108792 - Amanieu:ohos, r=petrochenkov
Add OpenHarmony targets - `aarch64-unknown-linux-ohos` - `armv7-unknown-linux-ohos` Compiler team MCP: https://github.com/rust-lang/compiler-team/issues/568
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp index e604e44a715..329e7329b11 100644 --- a/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp @@ -368,7 +368,8 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine( bool EmitStackSizeSection, bool RelaxELFRelocations, bool UseInitArray, - const char *SplitDwarfFile) { + const char *SplitDwarfFile, + bool ForceEmulatedTls) { auto OptLevel = fromRust(RustOptLevel); auto RM = fromRust(RustReloc); @@ -400,6 +401,10 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine( } Options.RelaxELFRelocations = RelaxELFRelocations; Options.UseInitArray = UseInitArray; + if (ForceEmulatedTls) { + Options.ExplicitEmulatedTLS = true; + Options.EmulatedTLS = true; + } if (TrapUnreachable) { // Tell LLVM to codegen `unreachable` into an explicit trap instruction. |