Skip to content

Commit 2b57cdf

Browse files
committed
musleabi* targets: we no longer need to set gnueabi* for LLVM now that we set the float ABI explicitly
1 parent d8d2fc1 commit 2b57cdf

5 files changed

+5
-21
lines changed

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

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

33
pub(crate) fn target() -> Target {
44
Target {
5-
// It's important we use "gnueabi" and not "musleabi" here. LLVM uses it
6-
// to determine the calling convention and float ABI, and it doesn't
7-
// support the "musleabi" value.
8-
llvm_target: "arm-unknown-linux-gnueabi".into(),
5+
llvm_target: "arm-unknown-linux-musleabi".into(),
96
metadata: crate::spec::TargetMetadata {
107
description: Some("Armv6 Linux with musl 1.2.3".into()),
118
tier: Some(2),

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

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

33
pub(crate) fn target() -> Target {
44
Target {
5-
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM
6-
// uses it to determine the calling convention and float ABI, and it
7-
// doesn't support the "musleabihf" value.
8-
llvm_target: "arm-unknown-linux-gnueabihf".into(),
5+
llvm_target: "arm-unknown-linux-musleabihf".into(),
96
metadata: crate::spec::TargetMetadata {
107
description: Some("Armv6 Linux with musl 1.2.3, hardfloat".into()),
118
tier: Some(2),

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

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

33
pub(crate) fn target() -> Target {
44
Target {
5-
// FIXME: this comment below does not seem applicable?
6-
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM
7-
// uses it to determine the calling convention and float ABI, and LLVM
8-
// doesn't support the "musleabihf" value.
9-
llvm_target: "armv5te-unknown-linux-gnueabi".into(),
5+
llvm_target: "armv5te-unknown-linux-musleabi".into(),
106
metadata: crate::spec::TargetMetadata {
117
description: Some("Armv5TE Linux with musl 1.2.3".into()),
128
tier: Some(2),

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

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

55
pub(crate) fn target() -> Target {
66
Target {
7-
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM
8-
// uses it to determine the calling convention and float ABI, and LLVM
9-
// doesn't support the "musleabihf" value.
10-
llvm_target: "armv7-unknown-linux-gnueabihf".into(),
7+
llvm_target: "armv7-unknown-linux-musleabihf".into(),
118
metadata: crate::spec::TargetMetadata {
129
description: Some("Armv7-A Linux with musl 1.2.3, hardfloat".into()),
1310
tier: Some(2),

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ use crate::spec::{FloatAbi, Target, TargetOptions, base};
88

99
pub(crate) fn target() -> Target {
1010
Target {
11-
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM
12-
// uses it to determine the calling convention and float ABI, and LLVM
13-
// doesn't support the "musleabihf" value.
14-
llvm_target: "armv7-unknown-linux-gnueabihf".into(),
11+
llvm_target: "armv7-unknown-linux-musleabihf".into(),
1512
metadata: crate::spec::TargetMetadata {
1613
description: Some("Thumb2-mode ARMv7-A Linux with NEON, musl 1.2.3".into()),
1714
tier: Some(3),

0 commit comments

Comments
 (0)