diff options
| author | bors <bors@rust-lang.org> | 2019-05-20 00:37:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-20 00:37:48 +0000 |
| commit | 128b4c8035fc788b78157d4e1975cda0f25ce599 (patch) | |
| tree | 2821ec0ae0c94f2b83d5cf37c68c0ad95220d549 /src/librustc_codegen_llvm | |
| parent | a5000c5098d08d9240d875fcb4231533fb922ead (diff) | |
| parent | 614ffe56c6a0a3bf0dc649388d5cb7d6a3f0d0c1 (diff) | |
| download | rust-128b4c8035fc788b78157d4e1975cda0f25ce599.tar.gz rust-128b4c8035fc788b78157d4e1975cda0f25ce599.zip | |
Auto merge of #60969 - Centril:rollup-3j71mqj, r=Centril
Rollup of 6 pull requests Successful merges: - #60590 (Test interaction of unions with non-zero/niche-filling optimization) - #60745 (Perform constant propagation into terminators) - #60895 (Enable thumbv7a-pc-windows-msvc target build end to end in rust/master) - #60908 (Fix lints handling in rustdoc) - #60960 (Stop using gensyms in HIR lowering) - #60962 (Fix data types indication) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/back/write.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs index cb59cf41a3c..66ba95810a6 100644 --- a/src/librustc_codegen_llvm/back/write.rs +++ b/src/librustc_codegen_llvm/back/write.rs @@ -795,10 +795,10 @@ fn create_msvc_imps( return } // The x86 ABI seems to require that leading underscores are added to symbol - // names, so we need an extra underscore on 32-bit. There's also a leading + // names, so we need an extra underscore on x86. There's also a leading // '\x01' here which disables LLVM's symbol mangling (e.g., no extra // underscores added in front). - let prefix = if cgcx.target_pointer_width == "32" { + let prefix = if cgcx.target_arch == "x86" { "\x01__imp__" } else { "\x01__imp_" |