Skip to content

Commit e6e4283

Browse files
authored
Unrolled build for rust-lang#138431
Rollup merge of rust-lang#138431 - madsmtm:uclibc-llvm-target, r=jieyouxu Fix `uclibc` LLVM target triples `uclibc` is not an environment understood by LLVM, it is only a concept in Clang that can be selected with `-muclibc` (it affects which dynamic linker is passed to the static linker's `-dynamic-linker` flag). In fact, using `uclibcgnueabi`/`uclibc` is actively harmful, as it prevents LLVM from seeing that the target is gnu-like; we should use `gnueabi`/`gnu` directly instead. Motivation: To make it easier to verify that [`cc-rs`' conversion from `rustc` to Clang/LLVM triples](rust-lang/cc-rs#1431) is correct. **There are no target maintainers for these targets.** So I'll CC ``@lancethepants`` and ``@skrap`` who maintain the related `armv7-unknown-linux-uclibceabi` and `armv7-unknown-linux-uclibceabihf` (both of which already pass `-gnu` instead of `-uclibc`) in case they have any insights. r? jieyouxu
2 parents 1799887 + eab700a commit e6e4283

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::{FloatAbi, Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
5-
llvm_target: "armv5te-unknown-linux-uclibcgnueabi".into(),
5+
llvm_target: "armv5te-unknown-linux-gnueabi".into(),
66
metadata: TargetMetadata {
77
description: Some("Armv5TE Linux with uClibc".into()),
88
tier: Some(3),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::spec::{Target, TargetMetadata, TargetOptions, base};
44

55
pub(crate) fn target() -> Target {
66
Target {
7-
llvm_target: "mips-unknown-linux-uclibc".into(),
7+
llvm_target: "mips-unknown-linux-gnu".into(),
88
metadata: TargetMetadata {
99
description: Some("MIPS Linux with uClibc".into()),
1010
tier: Some(3),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::{Target, TargetMetadata, TargetOptions, base};
22

33
pub(crate) fn target() -> Target {
44
Target {
5-
llvm_target: "mipsel-unknown-linux-uclibc".into(),
5+
llvm_target: "mipsel-unknown-linux-gnu".into(),
66
metadata: TargetMetadata {
77
description: Some("MIPS (LE) Linux with uClibc".into()),
88
tier: Some(3),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pub(crate) fn target() -> Target {
88
base.panic_strategy = PanicStrategy::Abort;
99

1010
Target {
11-
llvm_target: "x86_64-unknown-l4re-uclibc".into(),
11+
llvm_target: "x86_64-unknown-l4re-gnu".into(),
1212
metadata: TargetMetadata {
1313
description: None,
1414
tier: Some(3),

0 commit comments

Comments
 (0)