Skip to content

Commit 1573b31

Browse files
committed
Add more Linux-based syscall tables
* Add syscall tables to most remaining arches in `src/unix/notbsd` * Add aarch64/arm musl to CI * Update dependencies
1 parent 84da91c commit 1573b31

File tree

19 files changed

+4094
-132
lines changed

19 files changed

+4094
-132
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ matrix:
4949
- env: TARGET=x86_64-unknown-linux-musl
5050
- env: TARGET=i686-unknown-linux-musl
5151
- env: TARGET=arm-unknown-linux-gnueabihf
52+
- env: TARGET=arm-unknown-linux-musleabihf
5253
- env: TARGET=aarch64-unknown-linux-gnu
54+
- env: TARGET=aarch64-unknown-linux-musl
5355
- os: osx
5456
osx_image: xcode8.2
5557
env: TARGET=i386-apple-ios

Cargo.lock

Lines changed: 39 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/docker/aarch64-unknown-linux-musl/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.16.tar.gz | \
1818
make ARCH=arm64 prefix=/musl-aarch64 install -j4 && \
1919
cd .. && \
2020
rm -rf kernel-headers-3.12.6-5
21+
22+
# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd?
2123
ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \
2224
CC_aarch64_unknown_linux_musl=musl-gcc \
25+
RUSTFLAGS='-Clink-args=-lgcc' \
2326
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc \
2427
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUNNER="qemu-aarch64 -L /musl-aarch64"
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM ubuntu:17.10
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
gcc make libc6-dev git curl ca-certificates \
5+
gcc-arm-linux-gnueabihf qemu-user
6+
7+
RUN curl https://www.musl-libc.org/releases/musl-1.1.16.tar.gz | tar xzf -
8+
WORKDIR /musl-1.1.16
9+
RUN CC=arm-linux-gnueabihf-gcc \
10+
CFLAGS="-march=armv6 -marm" \
11+
./configure --prefix=/musl-arm --enable-wrapper=yes
12+
RUN make install -j4
13+
14+
# Install linux kernel headers sanitized for use with musl
15+
RUN \
16+
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
17+
tar xzf - && \
18+
cd kernel-headers-3.12.6-5 && \
19+
make ARCH=arm prefix=/musl-arm install -j4 && \
20+
cd .. && \
21+
rm -rf kernel-headers-3.12.6-5
22+
ENV PATH=$PATH:/musl-arm/bin:/rust/bin \
23+
CC_arm_unknown_linux_musleabihf=musl-gcc \
24+
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=musl-gcc \
25+
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_RUNNER="qemu-arm -L /musl-arm"

libc-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build = "build.rs"
88
libc = { path = ".." }
99

1010
[build-dependencies]
11-
ctest = { git = 'https://github.com/alexcrichton/ctest', branch = 'long' }
11+
ctest = "0.1.6"
1212

1313
[[test]]
1414
name = "main"

0 commit comments

Comments
 (0)