Skip to content

Commit 5fa3fcc

Browse files
authored
Unrolled build for rust-lang#132950
Rollup merge of rust-lang#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
2 parents b420d92 + d3768ea commit 5fa3fcc

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

compiler/rustc_target/src/spec/targets/m68k_unknown_linux_gnu.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::abi::Endian;
2-
use crate::spec::{Target, TargetOptions, base};
2+
use crate::spec::{LinkSelfContainedDefault, Target, TargetOptions, base};
33

44
pub(crate) fn target() -> Target {
55
let mut base = base::linux_gnu::opts();
@@ -17,6 +17,13 @@ pub(crate) fn target() -> Target {
1717
pointer_width: 32,
1818
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(),
1919
arch: "m68k".into(),
20-
options: TargetOptions { endian: Endian::Big, mcount: "_mcount".into(), ..base },
20+
options: TargetOptions {
21+
endian: Endian::Big,
22+
mcount: "_mcount".into(),
23+
24+
// LLD currently does not have support for M68k
25+
link_self_contained: LinkSelfContainedDefault::False,
26+
..base
27+
},
2128
}
2229
}

0 commit comments

Comments
 (0)