Skip to content

Commit b8d3b46

Browse files
committed
Pull in liblibc & compiler-rt changes for ARM MUSL support.
1 parent 8d0dd78 commit b8d3b46

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/bootstrap/build/native.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,14 @@ pub fn compiler_rt(build: &Build, target: &str) {
124124
target.contains("freebsd") ||
125125
target.contains("netbsd") {
126126
let os = if target.contains("android") {"-android"} else {""};
127-
let arch = if arch.starts_with("arm") && target.contains("eabihf") {
127+
let arch = if arch.starts_with("armv7") {
128+
"armv7"
129+
} else if arch.starts_with("arm") {
130+
if target.contains("eabihf") || target.contains("android") {
128131
"armhf"
132+
} else {
133+
"arm"
134+
}
129135
} else {
130136
arch
131137
};

src/compiler-rt

Submodule compiler-rt updated 334 files

0 commit comments

Comments
 (0)