Skip to content

Commit 724f811

Browse files
borsbors
authored
Auto merge of #35060 - japaric:arm-musl, r=alexcrichton
Add ARM MUSL targets Rebase of #33189. I tested this by producing a std for `arm-unknown-linux-musleabi` then I cross compiled Hello world to said target. Checked that the produced binary was statically linked and verified that the binary worked under QEMU. This depends on rust-lang/libc#341. I'll have to update this PR after that libc PR is merged. I'm also working on generating ARM musl cross toolchain via crosstool-ng. Once I verified those work, I'll send a PR to rust-buildbot. r? @alexcrichton cc @timonvo
2 parents c267ab4 + eb61738 commit 724f811

20 files changed

+144
-21
lines changed

‎configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ do
11921192
;;
11931193

11941194

1195-
x86_64-*-musl)
1195+
x86_64-*-musl | arm-*-musleabi)
11961196
if [ ! -f $CFG_MUSL_ROOT/lib/libc.a ]
11971197
then
11981198
err "musl libc $CFG_MUSL_ROOT/lib/libc.a not found"

‎mk/cfg/arm-unknown-linux-musleabi.mk

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# This file is intentially left empty to indicate that, while this target is
2+
# supported, it's not supported using plain GNU Make builds. Use a --rustbuild
3+
# instead.

‎mk/cfg/arm-unknown-linux-musleabihf.mk

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# This file is intentially left empty to indicate that, while this target is
2+
# supported, it's not supported using plain GNU Make builds. Use a --rustbuild
3+
# instead.

‎mk/cfg/armv7-unknown-linux-musleabihf.mk

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# This file is intentially left empty to indicate that, while this target is
2+
# supported, it's not supported using plain GNU Make builds. Use a --rustbuild
3+
# instead.

‎src/bootstrap/Cargo.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/bootstrap/compile.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ pub fn std_link(build: &Build,
9292
}
9393
add_to_sysroot(&out_dir, &libdir);
9494

95-
if target.contains("musl") &&
96-
(target.contains("x86_64") || target.contains("i686")) {
95+
if target.contains("musl") && !target.contains("mips") {
9796
copy_third_party_objects(build, target, &libdir);
9897
}
9998
}

‎src/bootstrap/sanity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ pub fn check(build: &mut Build) {
109109
}
110110

111111
// Make sure musl-root is valid if specified
112-
if target.contains("musl") && (target.contains("x86_64") || target.contains("i686")) {
112+
if target.contains("musl") && !target.contains("mips") {
113113
match build.config.musl_root {
114114
Some(ref root) => {
115115
if fs::metadata(root.join("lib/libc.a")).is_err() {

‎src/liballoc_jemalloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ libc = { path = "../rustc/libc_shim" }
1616

1717
[build-dependencies]
1818
build_helper = { path = "../build_helper" }
19-
gcc = "0.3.17"
19+
gcc = "0.3.27"
2020

2121
[features]
2222
debug = []

‎src/liballoc_jemalloc/build.rs

+10-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,16 @@ fn main() {
7373
.replace("\\", "/"))
7474
.current_dir(&build_dir)
7575
.env("CC", compiler.path())
76-
.env("EXTRA_CFLAGS", cflags)
76+
.env("EXTRA_CFLAGS", cflags.clone())
77+
// jemalloc generates Makefile deps using GCC's "-MM" flag. This means
78+
// that GCC will run the preprocessor, and only the preprocessor, over
79+
// jemalloc's source files. If we don't specify CPPFLAGS, then at least
80+
// on ARM that step fails with a "Missing implementation for 32-bit
81+
// atomic operations" error. This is because no "-march" flag will be
82+
// passed to GCC, and then GCC won't define the
83+
// "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4" macro that jemalloc needs to
84+
// select an atomic operation implementation.
85+
.env("CPPFLAGS", cflags.clone())
7786
.env("AR", &ar)
7887
.env("RANLIB", format!("{} s", ar.display()));
7988

‎src/libflate/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ crate-type = ["dylib"]
1111

1212
[build-dependencies]
1313
build_helper = { path = "../build_helper" }
14-
gcc = "0.3"
14+
gcc = "0.3.27"

‎src/liblibc

‎src/librustc_back/target/arm_unknown_linux_musleabi.rs

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use target::{Target, TargetResult};
12+
13+
pub fn target() -> TargetResult {
14+
let mut base = super::linux_musl_base::opts();
15+
16+
// Most of these settings are copied from the arm_unknown_linux_gnueabi
17+
// target.
18+
base.features = "+v6".to_string();
19+
base.max_atomic_width = 64;
20+
Ok(Target {
21+
// It's important we use "gnueabi" and not "musleabi" here. LLVM uses it
22+
// to determine the calling convention and float ABI, and it doesn't
23+
// support the "musleabi" value.
24+
llvm_target: "arm-unknown-linux-gnueabi".to_string(),
25+
target_endian: "little".to_string(),
26+
target_pointer_width: "32".to_string(),
27+
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
28+
arch: "arm".to_string(),
29+
target_os: "linux".to_string(),
30+
target_env: "musl".to_string(),
31+
target_vendor: "unknown".to_string(),
32+
options: base,
33+
})
34+
}

‎src/librustc_back/target/arm_unknown_linux_musleabihf.rs

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use target::{Target, TargetResult};
12+
13+
pub fn target() -> TargetResult {
14+
let mut base = super::linux_musl_base::opts();
15+
16+
// Most of these settings are copied from the arm_unknown_linux_gnueabihf
17+
// target.
18+
base.features = "+v6,+vfp2".to_string();
19+
base.max_atomic_width = 64;
20+
Ok(Target {
21+
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM
22+
// uses it to determine the calling convention and float ABI, and it
23+
// doesn't support the "musleabihf" value.
24+
llvm_target: "arm-unknown-linux-gnueabihf".to_string(),
25+
target_endian: "little".to_string(),
26+
target_pointer_width: "32".to_string(),
27+
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
28+
arch: "arm".to_string(),
29+
target_os: "linux".to_string(),
30+
target_env: "musl".to_string(),
31+
target_vendor: "unknown".to_string(),
32+
options: base,
33+
})
34+
}

‎src/librustc_back/target/armv7_unknown_linux_musleabihf.rs

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use target::{Target, TargetResult};
12+
13+
pub fn target() -> TargetResult {
14+
let mut base = super::linux_musl_base::opts();
15+
16+
// Most of these settings are copied from the armv7_unknown_linux_gnueabihf
17+
// target.
18+
base.features = "+v7,+vfp3,+neon".to_string();
19+
base.cpu = "cortex-a8".to_string();
20+
base.max_atomic_width = 64;
21+
Ok(Target {
22+
// It's important we use "gnueabihf" and not "musleabihf" here. LLVM
23+
// uses it to determine the calling convention and float ABI, and LLVM
24+
// doesn't support the "musleabihf" value.
25+
llvm_target: "armv7-unknown-linux-gnueabihf".to_string(),
26+
target_endian: "little".to_string(),
27+
target_pointer_width: "32".to_string(),
28+
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
29+
arch: "arm".to_string(),
30+
target_os: "linux".to_string(),
31+
target_env: "musl".to_string(),
32+
target_vendor: "unknown".to_string(),
33+
options: base,
34+
})
35+
}

‎src/librustc_back/target/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,10 @@ supported_targets! {
134134
("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu),
135135
("arm-unknown-linux-gnueabi", arm_unknown_linux_gnueabi),
136136
("arm-unknown-linux-gnueabihf", arm_unknown_linux_gnueabihf),
137+
("arm-unknown-linux-musleabi", arm_unknown_linux_musleabi),
138+
("arm-unknown-linux-musleabihf", arm_unknown_linux_musleabihf),
137139
("armv7-unknown-linux-gnueabihf", armv7_unknown_linux_gnueabihf),
140+
("armv7-unknown-linux-musleabihf", armv7_unknown_linux_musleabihf),
138141
("aarch64-unknown-linux-gnu", aarch64_unknown_linux_gnu),
139142
("x86_64-unknown-linux-musl", x86_64_unknown_linux_musl),
140143
("i686-unknown-linux-musl", i686_unknown_linux_musl),

‎src/librustc_llvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ rustc_bitflags = { path = "../librustc_bitflags" }
1717

1818
[build-dependencies]
1919
build_helper = { path = "../build_helper" }
20-
gcc = "0.3"
20+
gcc = "0.3.27"

‎src/librustdoc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ log = { path = "../liblog" }
2828

2929
[build-dependencies]
3030
build_helper = { path = "../build_helper" }
31-
gcc = "0.3"
31+
gcc = "0.3.27"

‎src/libstd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ unwind = { path = "../libunwind" }
2424

2525
[build-dependencies]
2626
build_helper = { path = "../build_helper" }
27-
gcc = "0.3"
27+
gcc = "0.3.27"
2828

2929
[features]
3030
backtrace = []

‎src/libunwind/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn main() {
1616
let target = env::var("TARGET").unwrap();
1717

1818
if target.contains("linux") {
19-
if target.contains("musl") && (target.contains("x86_64") || target.contains("i686")) {
19+
if target.contains("musl") && !target.contains("mips") {
2020
println!("cargo:rustc-link-lib=static=unwind");
2121
} else if !target.contains("android") {
2222
println!("cargo:rustc-link-lib=gcc_s");

‎src/rustc/std_shim/Cargo.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)