diff options
| author | Daniel Paoliello <danpao@microsoft.com> | 2024-09-19 15:00:30 -0700 |
|---|---|---|
| committer | Daniel Paoliello <danpao@microsoft.com> | 2024-09-24 10:10:31 -0700 |
| commit | b2fd8a0192f6a69a4fb969ab3d005b577a524371 (patch) | |
| tree | 13ea8e2625cdcadd74674e28ea0435118a4d7cf0 /compiler/rustc_codegen_llvm/src/consts.rs | |
| parent | 13a50977964460d8fb5bdf10740de3ac93e6021b (diff) | |
| download | rust-b2fd8a0192f6a69a4fb969ab3d005b577a524371.tar.gz rust-b2fd8a0192f6a69a4fb969ab3d005b577a524371.zip | |
Test fixing raw-dylib
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/consts.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/consts.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/compiler/rustc_codegen_llvm/src/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs index c3b1676f77e..dc86ef22e37 100644 --- a/compiler/rustc_codegen_llvm/src/consts.rs +++ b/compiler/rustc_codegen_llvm/src/consts.rs @@ -196,16 +196,10 @@ fn check_and_apply_linkage<'ll, 'tcx>( g2 } } else if cx.tcx.sess.target.arch == "x86" + && common::is_mingw_gnu_toolchain(&cx.tcx.sess.target) && let Some(dllimport) = crate::common::get_dllimport(cx.tcx, def_id, sym) { - cx.declare_global( - &common::i686_decorated_name( - dllimport, - common::is_mingw_gnu_toolchain(&cx.tcx.sess.target), - true, - ), - llty, - ) + cx.declare_global(&common::i686_decorated_name(dllimport, true, true, false), llty) } else { // Generate an external declaration. // FIXME(nagisa): investigate whether it can be changed into define_global |