diff options
| author | John Kugelman <john@kugelman.name> | 2021-10-10 10:15:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-10 10:15:16 -0400 |
| commit | ecd7ea8a9c4abd3c3d0b23eda9e1a35bbe70215a (patch) | |
| tree | d5e629669b27c4cd861aae8e5aff710b1ebcf334 /compiler/rustc_codegen_llvm/src | |
| parent | 58cc18c56b9d9422b376fdf5c51c20fb0e494e66 (diff) | |
| parent | 9e8356c6adf119f983651d533d2b307544086cf9 (diff) | |
| download | rust-ecd7ea8a9c4abd3c3d0b23eda9e1a35bbe70215a.tar.gz rust-ecd7ea8a9c4abd3c3d0b23eda9e1a35bbe70215a.zip | |
Merge branch 'rust-lang:master' into must-use-alloc-constructors
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/callee.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/callee.rs b/compiler/rustc_codegen_llvm/src/callee.rs index 5d68d2b77d4..1bc924d3b90 100644 --- a/compiler/rustc_codegen_llvm/src/callee.rs +++ b/compiler/rustc_codegen_llvm/src/callee.rs @@ -175,7 +175,7 @@ pub fn get_fn(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'tcx>) -> &'ll Value // should use dllimport for functions. if cx.use_dll_storage_attrs && tcx.is_dllimport_foreign_item(instance_def_id) - && tcx.sess.target.env != "gnu" + && !matches!(tcx.sess.target.env.as_ref(), "gnu" | "uclibc") { llvm::LLVMSetDLLStorageClass(llfn, llvm::DLLStorageClass::DllImport); } |