Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ pub(crate) fn target() -> Target {
base.cpu = "mips64r2".into();
base.features = "+mips64r2,+xgot".into();
base.max_atomic_width = Some(64);
// FIXME(compiler-team#422): musl targets should be dynamically linked by default.
base.crt_static_default = true;
Target {
// LLVM doesn't recognize "muslabi64" yet.
llvm_target: "mips64el-unknown-linux-musl".into(),
Expand Down
3 changes: 1 addition & 2 deletions tests/run-make/musl-default-linking/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use run_make_support::{rustc, serde_json};
// Per https://github.com/rust-lang/compiler-team/issues/422,
// we should be trying to move these targets to dynamically link
// musl libc by default.
//@ needs-llvm-components: aarch64 arm mips powerpc x86
//@ needs-llvm-components: aarch64 arm powerpc x86
static LEGACY_STATIC_LINKING_TARGETS: &[&'static str] = &[
"aarch64-unknown-linux-musl",
"arm-unknown-linux-musleabi",
Expand All @@ -14,7 +14,6 @@ static LEGACY_STATIC_LINKING_TARGETS: &[&'static str] = &[
"armv7-unknown-linux-musleabihf",
"i586-unknown-linux-musl",
"i686-unknown-linux-musl",
"mips64el-unknown-linux-muslabi64",
"powerpc64le-unknown-linux-musl",
"x86_64-unknown-linux-musl",
];
Expand Down
Loading