diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-11-12 23:26:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-12 23:26:44 +0100 |
| commit | f7e40680b5a2b072dc38cd1e6876c8a3eb4701da (patch) | |
| tree | 6224da932a2fccfb8b498b7a38c8f8b63a65c8d2 | |
| parent | 978f592539def4d5fba61067345dba6fcab15342 (diff) | |
| parent | d3768ea81f15e668f0c0d30149e4840a036a78e6 (diff) | |
| download | rust-f7e40680b5a2b072dc38cd1e6876c8a3eb4701da.tar.gz rust-f7e40680b5a2b072dc38cd1e6876c8a3eb4701da.zip | |
Rollup merge of #132950 - knickish:m68k_gnu_ld, r=workingjubilee
Use GNU ld on m68k-unknown-linux-gnu LLD does not really support the M68k architecture yet, specify `m68k-linux-gnu-ld` as the linker for the platform
| -rw-r--r-- | compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs index c0bcc79b5b9..1515d8fe00a 100644 --- a/compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs +++ b/compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs @@ -1,5 +1,5 @@ use crate::abi::Endian; -use crate::spec::{Target, TargetOptions, base}; +use crate::spec::{LinkSelfContainedDefault, Target, TargetOptions, base}; pub(crate) fn target() -> Target { let mut base = base::linux_gnu::opts(); @@ -17,6 +17,13 @@ pub(crate) fn target() -> Target { pointer_width: 32, data_layout: "E-m:e-p:32:16:32-i8:8:8-i16:16:16-i32:16:32-n8:16:32-a:0:16-S16".into(), arch: "m68k".into(), - options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base }, + options: TargetOptions { + endian: Endian::Big, + mcount: "_mcount".into(), + + // LLD currently does not have support for M68k + link_self_contained: LinkSelfContainedDefault::False, + ..base + }, } } |
