Revert "Fix linking statics on Arm64EC #140176"
Unfortunately, multiple people are reporting linker warnings related to `__rust_no_alloc_shim_is_unstable` after this change. The solution isn't quite clear yet, let's revert to green for now, and try a reland with a determined solution for `__rust_no_alloc_shim_is_unstable`. This reverts commitc8b7f32434, reversing changes made to667247db71.
This commit is contained in:
@@ -364,12 +364,7 @@ impl<'ll> CodegenCx<'ll, '_> {
|
||||
|
||||
if !def_id.is_local() {
|
||||
let needs_dll_storage_attr = self.use_dll_storage_attrs
|
||||
// If the symbol is a foreign item, then don't automatically apply DLLImport, as
|
||||
// we'll rely on the #[link] attribute instead. BUT, if this is an internal symbol
|
||||
// then it may be generated by the compiler in some crate, so we do need to apply
|
||||
// DLLImport when linking with the MSVC linker.
|
||||
&& (!self.tcx.is_foreign_item(def_id)
|
||||
|| (self.sess().target.is_like_msvc && fn_attrs.flags.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL)))
|
||||
&& !self.tcx.is_foreign_item(def_id)
|
||||
// Local definitions can never be imported, so we must not apply
|
||||
// the DLLImport annotation.
|
||||
&& !dso_local
|
||||
|
||||
Reference in New Issue
Block a user