Skip to content

Commit fce6771

Browse files
authored
Rollup merge of #144410 - Gelbpunkt:musl-tier3-dynamic, r=jieyouxu
Make tier 3 musl targets link dynamically by default Since we don't build std for these and don't provide any support for them, these can trivially be changed to link dynamically by default.
2 parents 37ad077 + effcd54 commit fce6771

8 files changed

+0
-15
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pub(crate) fn target() -> Target {
77
// FIXME: HVX length defaults are per-CPU
88
base.features = "-small-data,+hvx-length128b".into();
99

10-
base.crt_static_default = false;
1110
base.has_rpath = true;
1211
base.linker_flavor = LinkerFlavor::Unix(Cc::Yes);
1312

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ pub(crate) fn target() -> Target {
2323
abi: "abi64".into(),
2424
endian: Endian::Big,
2525
mcount: "_mcount".into(),
26-
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
27-
crt_static_default: true,
2826
llvm_abiname: "n64".into(),
2927
..base
3028
},

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ pub(crate) fn target() -> Target {
1010
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
1111
base.max_atomic_width = Some(64);
1212
base.stack_probes = StackProbeType::Inline;
13-
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
14-
base.crt_static_default = true;
1513
base.abi = "elfv2".into();
1614
base.llvm_abiname = "elfv2".into();
1715

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ pub(crate) fn target() -> Target {
99
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]);
1010
base.max_atomic_width = Some(32);
1111
base.stack_probes = StackProbeType::Inline;
12-
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
13-
base.crt_static_default = true;
1412

1513
Target {
1614
llvm_target: "powerpc-unknown-linux-musl".into(),

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ pub(crate) fn target() -> Target {
99
base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-mspe"]);
1010
base.max_atomic_width = Some(32);
1111
base.stack_probes = StackProbeType::Inline;
12-
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
13-
base.crt_static_default = true;
1412

1513
Target {
1614
llvm_target: "powerpc-unknown-linux-muslspe".into(),

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ pub(crate) fn target() -> Target {
2323
llvm_abiname: "ilp32d".into(),
2424
max_atomic_width: Some(32),
2525
supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
26-
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
27-
crt_static_default: true,
2826
..base::linux_musl::opts()
2927
},
3028
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ pub(crate) fn target() -> Target {
1313
base.stack_probes = StackProbeType::Inline;
1414
base.supported_sanitizers =
1515
SanitizerSet::ADDRESS | SanitizerSet::LEAK | SanitizerSet::MEMORY | SanitizerSet::THREAD;
16-
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
17-
base.crt_static_default = true;
1816

1917
Target {
2018
llvm_target: "s390x-unknown-linux-musl".into(),

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ pub(crate) fn target() -> Target {
2727
features: "+v7,+thumb-mode,+thumb2,+vfp3,+neon".into(),
2828
max_atomic_width: Some(64),
2929
mcount: "\u{1}mcount".into(),
30-
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
31-
crt_static_default: true,
3230
..base::linux_musl::opts()
3331
},
3432
}

0 commit comments

Comments
 (0)