Merge pull request #109 from japaric/arm-musl

prepare for binary releases of std for arm-musl

Author: alexcrichton

slaves/linux-cross/Dockerfile

@@ -51,10 +51,13 @@ RUN /bin/bash build_toolchain_root.sh && \
 COPY linux-cross/build_toolchain.sh \
     linux-cross/aarch64-linux-gnu.config \
     linux-cross/arm-linux-gnueabi.config \
+    linux-cross/arm-linux-musleabi.config \
     linux-cross/arm-linux-gnueabihf.config \
+    linux-cross/arm-linux-musleabihf.config \
     linux-cross/mips-linux-musl.config \
     linux-cross/mipsel-linux-musl.config \
     linux-cross/armv7-linux-gnueabihf.config \
+    linux-cross/armv7-linux-musleabihf.config \
     /build/
 USER rustbuild
 
@@ -98,6 +101,11 @@ RUN /bin/bash build_toolchain.sh mipsel-linux-musl
 # for armv7 instead of for armv6 should make rustc (slightly) faster.
 RUN /bin/bash build_toolchain.sh armv7-linux-gnueabihf
 
+# Build a bunch of toolchains for ARM musl targets
+RUN /bin/bash build_toolchain.sh arm-linux-musleabi
+RUN /bin/bash build_toolchain.sh arm-linux-musleabihf
+RUN /bin/bash build_toolchain.sh armv7-linux-musleabihf
+
 USER root
 
 # Rename all the compilers we just built into /usr/bin and also without
@@ -124,12 +132,27 @@ RUN bash /tmp/build_dragonfly_toolchain.sh
 COPY linux-cross/build_netbsd_toolchain.sh /tmp/
 RUN bash /tmp/build_netbsd_toolchain.sh
 
+# Also build libunwind.a for the ARM musl targets
+COPY linux-cross/build-libunwind.sh \
+    /build/
+RUN /bin/bash build-libunwind.sh arm-unknown-linux-musleabi
+RUN /bin/bash build-libunwind.sh arm-unknown-linux-musleabihf
+RUN /bin/bash build-libunwind.sh armv7-unknown-linux-musleabihf
 
 # Instruct rustbuild to use the armv7-linux-gnueabihf toolchain instead of the
 # default arm-linux-gnueabihf one
 ENV AR_armv7_unknown_linux_gnueabihf=armv7-linux-gnueabihf-ar \
     CC_armv7_unknown_linux_gnueabihf=armv7-linux-gnueabihf-gcc \
     CXX_armv7_unknown_linux_gnueabihf=armv7-linux-gnueabihf-g++ \
+    AR_arm_unknown_linux_musleabi=arm-linux-musleabi-ar \
+    CC_arm_unknown_linux_musleabi=arm-linux-musleabi-gcc \
+    CXX_arm_unknown_linux_musleabi=arm-linux-musleabi-g++ \
+    AR_arm_unknown_linux_musleabihf=arm-linux-musleabihf-ar \
+    CC_arm_unknown_linux_musleabihf=arm-linux-musleabihf-gcc \
+    CXX_arm_unknown_linux_musleabihf=arm-linux-musleabihf-g++ \
+    AR_armv7_unknown_linux_musleabihf=armv7-linux-musleabihf-ar \
+    CC_armv7_unknown_linux_musleabihf=armv7-linux-musleabihf-gcc \
+    CXX_armv7_unknown_linux_musleabihf=armv7-linux-musleabihf-g++ \
     AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-ar \
     CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-gcc \
     CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-g++ \

slaves/linux-cross/README.md

@@ -89,6 +89,20 @@ For targets: `arm-unknown-linux-gnueabi`
 - C compiler > gcc version = 4.9.3
 - C compiler > C++ = ENABLE -- to cross compile LLVM
 
+## `arm-linux-musleabi.config`
+
+For targets: `arm-unknown-linux-musleabi`
+
+- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
+- Target options > Target Architecture = arm
+- Target options > Architecture level = armv6 -- (+)
+- Target options > Floating point = software (no FPU) -- (\*)
+- Operating System > Target OS = linux
+- Operating System > Linux kernel version = 3.2.72 -- Precise kernel
+- C-library > C library = musl
+- C compiler > gcc version = 5.2.0
+- C compiler > C++ = ENABLE -- to cross compile LLVM
+
 ## `arm-linux-gnueabihf.config`
 
 For targets: `arm-unknown-linux-gnueabihf`
@@ -105,6 +119,22 @@ For targets: `arm-unknown-linux-gnueabihf`
 - C compiler > gcc version = 4.9.3
 - C compiler > C++ = ENABLE -- to cross compile LLVM
 
+## `arm-linux-musleabihf.config`
+
+For targets: `arm-unknown-linux-musleabihf`
+
+- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
+- Target options > Target Architecture = arm
+- Target options > Architecture level = armv6 -- (+)
+- Target options > Use specific FPU = vfp -- (+)
+- Target options > Floating point = hardware (FPU) -- (\*)
+- Target options > Default instruction set mode = arm -- (+)
+- Operating System > Target OS = linux
+- Operating System > Linux kernel version = 3.2.72 -- Precise kernel
+- C-library > C library = musl
+- C compiler > gcc version = 5.2.0
+- C compiler > C++ = ENABLE -- to cross compile LLVM
+
 ## `armv7-linux-gnueabihf.config`
 
 For targets: `armv7-unknown-linux-gnueabihf`
@@ -128,6 +158,23 @@ For targets: `armv7-unknown-linux-gnueabihf`
     libraries like jemalloc. See the mk/cfg/arm(v7)-uknown-linux-gnueabi{,hf}.mk
     file in Rust's source code.
 
+## `armv7-linux-musleabihf.config`
+
+For targets: `armv7-unknown-linux-musleabihf`
+
+- Path and misc options > Prefix directory = /x-tools/${CT\_TARGET}
+- Target options > Target Architecture = arm
+- Target options > Suffix to the arch-part = v7
+- Target options > Architecture level = armv7-a -- (+)
+- Target options > Use specific FPU = vfpv3-d16 -- (\*)
+- Target options > Floating point = hardware (FPU) -- (\*)
+- Target options > Default instruction set mode = thumb -- (\*)
+- Operating System > Target OS = linux
+- Operating System > Linux kernel version = 3.2.72 -- Precise kernel
+- C-library > C library = musl
+- C compiler > gcc version = 5.2.0
+- C compiler > C++ = ENABLE -- to cross compile LLVM
+
 ## `aarch64-linux-gnu.config`
 
 For targets: `aarch64-unknown-linux-gnu`