mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add eabi suffix to armv5te musl target

Browse Source
This commit is contained in:
Harm Berntsen 2018-05-04 08:47:24 +02:00
parent b71f6364d2
commit 80f1912d83
No known key found for this signature in database
GPG Key ID: 7D2B8FD751A61CD7
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/configure.py
View File

@ -120,7 +120,7 @@ v("musl-root-arm", "target.arm-unknown-linux-musleabi.musl-root",
"arm-unknown-linux-musleabi install directory")
v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root",
"arm-unknown-linux-musleabihf install directory")
v("musl-root-armv5te", "target.armv5te-unknown-linux-musl.musl-root",
v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root",
"armv5te-unknown-linux-musleabi install directory")
v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root",
"armv7-unknown-linux-musleabihf install directory")

6
src/ci/docker/dist-armv5te-linux-musl/Dockerfile → src/ci/docker/dist-armv5te-linux-musleabi/Dockerfile
View File

@ -29,12 +29,12 @@ RUN env \
bash musl.sh armv5te && \
rm -rf /build/*
ENV TARGETS=armv5te-unknown-linux-musl
ENV TARGETS=armv5te-unknown-linux-musleabi
# FIXME: remove armv5te vars after https://github.com/alexcrichton/cc-rs/issues/271
# get fixed and cc update
ENV CC_armv5te_unknown_linux_musl=arm-linux-gnueabi-gcc \
CFLAGS_armv5te_unknown_linux_musl="-march=armv5te -marm -mfloat-abi=soft"
ENV CC_armv5te_unknown_linux_musleabi=arm-linux-gnueabi-gcc \
CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft"
ENV RUST_CONFIGURE_ARGS \
--musl-root-armv5te=/musl-armv5te \

0
src/librustc_target/spec/armv5te_unknown_linux_musl.rs → src/librustc_target/spec/armv5te_unknown_linux_musleabi.rs
View File

2
src/librustc_target/spec/mod.rs
View File

@ -283,7 +283,7 @@ supported_targets! {
("arm-unknown-linux-musleabihf", arm_unknown_linux_musleabihf),
("armv4t-unknown-linux-gnueabi", armv4t_unknown_linux_gnueabi),
("armv5te-unknown-linux-gnueabi", armv5te_unknown_linux_gnueabi),
("armv5te-unknown-linux-musl", armv5te_unknown_linux_musl),
("armv5te-unknown-linux-musleabi", armv5te_unknown_linux_musleabi),
("armv7-unknown-linux-gnueabihf", armv7_unknown_linux_gnueabihf),
("armv7-unknown-linux-musleabihf", armv7_unknown_linux_musleabihf),
("aarch64-unknown-linux-gnu", aarch64_unknown_linux_gnu),

2
src/tools/build-manifest/src/main.rs
View File

@ -57,7 +57,7 @@ static TARGETS: &'static [&'static str] = &[
"arm-unknown-linux-musleabi",
"arm-unknown-linux-musleabihf",
"armv5te-unknown-linux-gnueabi",
"armv5te-unknown-linux-musl",
"armv5te-unknown-linux-musleabi",
"armv7-apple-ios",
"armv7-linux-androideabi",
"armv7-unknown-cloudabi-eabihf",