Skip to content

Commit 25e18ed

Browse files
ZalatharMuscraft
authored andcommitted
Rollup merge of rust-lang#146858 - Gelbpunkt:mips64el-musl-dynamic, r=jieyouxu
Make mips64el-unknown-linux-muslabi64 link dynamically I missed this target when I changed all the other tier 3 targets in rust-lang#144410. Only realized that this one was still statically linked when I looked at the list of targets in the test later (rust-lang#146588). since those two PRs were reviewed by you: r? ````@jieyouxu````
2 parents 63b8477 + ed81b4d commit 25e18ed

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ pub(crate) fn target() -> Target {
55
base.cpu = "mips64r2".into();
66
base.features = "+mips64r2,+xgot".into();
77
base.max_atomic_width = Some(64);
8-
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
9-
base.crt_static_default = true;
108
Target {
119
// LLVM doesn't recognize "muslabi64" yet.
1210
llvm_target: "mips64el-unknown-linux-musl".into(),

tests/run-make/musl-default-linking/rmake.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use run_make_support::{rustc, serde_json};
44
// Per https://github.com/rust-lang/compiler-team/issues/422,
55
// we should be trying to move these targets to dynamically link
66
// musl libc by default.
7-
//@ needs-llvm-components: aarch64 arm mips powerpc x86
7+
//@ needs-llvm-components: aarch64 arm powerpc x86
88
static LEGACY_STATIC_LINKING_TARGETS: &[&'static str] = &[
99
"aarch64-unknown-linux-musl",
1010
"arm-unknown-linux-musleabi",
@@ -14,7 +14,6 @@ static LEGACY_STATIC_LINKING_TARGETS: &[&'static str] = &[
1414
"armv7-unknown-linux-musleabihf",
1515
"i586-unknown-linux-musl",
1616
"i686-unknown-linux-musl",
17-
"mips64el-unknown-linux-muslabi64",
1817
"powerpc64le-unknown-linux-musl",
1918
"x86_64-unknown-linux-musl",
2019
];

0 commit comments

Comments
 (0)