Skip to content

Commit db54ada

Browse files
cactoriumcactorium
committed
Merge branch 'master' of https://github.com/rust-lang/libc 
2 parents 5b55e05 + 560e73f commit db54ada

File tree

75 files changed

+4225
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+4225
-490
lines changed

‎.travis.yml

Lines changed: 25 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: rust
2+
rust: stable
23
sudo: required
34
dist: trusty
45
services:
@@ -22,109 +23,63 @@ env:
2223
matrix:
2324
include:
2425
# 1.0.0 compat
25-
- os: linux
26-
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
26+
- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
2727
rust: 1.0.0
2828
script: cargo build
2929
install:
3030

3131
# build documentation
32-
- os: linux
33-
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
32+
- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
3433
rust: nightly
3534
script: sh ci/dox.sh
3635

3736
# stable compat
38-
- os: linux
39-
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
40-
rust: stable
41-
- os: linux
42-
env: TARGET=i686-unknown-linux-gnu
43-
rust: stable
37+
- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
38+
- env: TARGET=i686-unknown-linux-gnu
4439
- os: osx
4540
env: TARGET=x86_64-apple-darwin NO_ADD=1
46-
rust: stable
4741
- os: osx
4842
env: TARGET=i686-apple-darwin
49-
rust: stable
50-
- os: linux
51-
env: TARGET=arm-linux-androideabi
52-
rust: stable
53-
- os: linux
54-
env: TARGET=aarch64-linux-android
55-
rust: stable
56-
- os: linux
57-
env: TARGET=i686-linux-android
58-
rust: stable
59-
# as of 2017/05/03 x86_64-linux-android are not on stable
60-
- os: linux
61-
env: TARGET=x86_64-linux-android
62-
rust: beta
63-
- os: linux
64-
env: TARGET=x86_64-unknown-linux-musl
65-
rust: stable
66-
- os: linux
67-
env: TARGET=i686-unknown-linux-musl
68-
rust: stable
69-
- os: linux
70-
env: TARGET=arm-unknown-linux-gnueabihf
71-
rust: stable
72-
- os: linux
73-
env: TARGET=aarch64-unknown-linux-gnu
74-
rust: stable
43+
- env: TARGET=arm-linux-androideabi
44+
- env: TARGET=aarch64-linux-android
45+
- env: TARGET=i686-linux-android
46+
- env: TARGET=x86_64-linux-android
47+
- env: TARGET=x86_64-unknown-linux-musl
48+
- env: TARGET=i686-unknown-linux-musl
49+
- env: TARGET=arm-unknown-linux-gnueabihf
50+
- env: TARGET=aarch64-unknown-linux-gnu
7551
- os: osx
7652
osx_image: xcode8.2
7753
env: TARGET=i386-apple-ios
78-
rust: stable
7954
- os: osx
8055
osx_image: xcode8.2
8156
env: TARGET=x86_64-apple-ios
82-
rust: stable
83-
- os: linux
84-
env: TARGET=x86_64-rumprun-netbsd
85-
rust: stable
86-
- os: linux
87-
env: TARGET=powerpc-unknown-linux-gnu
88-
rust: stable
89-
- os: linux
90-
env: TARGET=powerpc64-unknown-linux-gnu
91-
rust: beta
92-
- os: linux
93-
env: TARGET=mips-unknown-linux-musl
94-
rust: stable
95-
- os: linux
96-
env: TARGET=mipsel-unknown-linux-musl
97-
rust: stable
98-
- os: linux
99-
env: TARGET=mips64-unknown-linux-gnuabi64
100-
rust: beta
101-
- os: linux
102-
env: TARGET=mips-unknown-linux-gnu
103-
rust: beta
57+
- env: TARGET=x86_64-rumprun-netbsd
58+
- env: TARGET=powerpc-unknown-linux-gnu
59+
- env: TARGET=powerpc64-unknown-linux-gnu
60+
- env: TARGET=mips-unknown-linux-musl
61+
- env: TARGET=mipsel-unknown-linux-musl
62+
- env: TARGET=mips64-unknown-linux-gnuabi64
63+
- env: TARGET=mips-unknown-linux-gnu
64+
- env: TARGET=s390x-unknown-linux-gnu
10465

10566
# beta
106-
- os: linux
107-
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
67+
- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
10868
rust: beta
10969
- os: osx
11070
env: TARGET=x86_64-apple-darwin NO_ADD=1
11171
rust: beta
11272

11373
# nightly
114-
- os: linux
115-
env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
74+
- env: TARGET=x86_64-unknown-linux-gnu NO_ADD=1
11675
rust: nightly
11776
- os: osx
11877
env: TARGET=x86_64-apple-darwin NO_ADD=1
11978
rust: nightly
12079

12180
# QEMU based targets that compile in an emulator
122-
- os: linux
123-
env: TARGET=x86_64-unknown-freebsd
124-
rust: stable
125-
- os: linux
126-
env: TARGET=x86_64-unknown-openbsd QEMU=openbsd.qcow2
127-
rust: stable
81+
- env: TARGET=x86_64-unknown-freebsd
82+
- env: TARGET=x86_64-unknown-openbsd QEMU=openbsd.qcow2
12883
script: sh ci/run-docker.sh $TARGET
12984
install:
13085

‎Cargo.lock

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

‎Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "libc"
4-
version = "0.2.22"
4+
version = "0.2.28"
55
authors = ["The Rust Project Developers"]
66
license = "MIT/Apache-2.0"
77
readme = "README.md"
@@ -13,6 +13,10 @@ A library for types and bindings to native C functions often found in libc or
1313
other common platform libraries.
1414
"""
1515

16+
[badges]
17+
travis-ci = { repository = "rust-lang/libc" }
18+
appveyor = { repository = "rust-lang-libs/libc" }
19+
1620
[features]
1721
default = ["use_std"]
1822
use_std = []

‎appveyor.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
environment:
2+
# When this was added there were revocation check failures when using the
3+
# libcurl backend as libcurl checks by default, but rustup doesn't provide the
4+
# switch to turn this off. Switch to Hyper which looks to not check for
5+
# revocation by default like libcurl does.
6+
RUSTUP_USE_HYPER: 1
7+
CARGO_HTTP_CHECK_REVOKE: false
28
matrix:
39
- TARGET: x86_64-pc-windows-gnu
410
MSYS2_BITS: 64

‎ci/android-install-ndk.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
set -ex
1313

14-
curl -O https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip
15-
unzip -q android-ndk-r13b-linux-x86_64.zip
14+
curl -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip
15+
unzip -q android-ndk-r15b-linux-x86_64.zip
1616

1717
case "$1" in
1818
aarch64)
@@ -28,9 +28,10 @@ case "$1" in
2828
;;
2929
esac;
3030

31-
android-ndk-r13b/build/tools/make_standalone_toolchain.py \
31+
android-ndk-r15b/build/tools/make_standalone_toolchain.py \
32+
--unified-headers \
3233
--install-dir /android/ndk-$1 \
3334
--arch $arch \
3435
--api 24
3536

36-
rm -rf ./android-ndk-r13b-linux-x86_64.zip ./android-ndk-r13b
37+
rm -rf ./android-ndk-r15b-linux-x86_64.zip ./android-ndk-r15b

‎ci/docker/aarch64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc libc6-dev ca-certificates \

‎ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc libc6-dev ca-certificates \

‎ci/docker/i686-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc-multilib libc6-dev ca-certificates

‎ci/docker/i686-unknown-linux-musl/Dockerfile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22

33
RUN dpkg --add-architecture i386
44
RUN apt-get update
@@ -18,6 +18,13 @@ RUN curl https://www.musl-libc.org/releases/musl-1.1.15.tar.gz | \
1818
CC=gcc CFLAGS=-m32 ./configure --prefix=/musl-i686 --disable-shared --target=i686 && \
1919
make CROSS_COMPILE= install -j4 && \
2020
cd .. && \
21-
rm -rf musl-1.1.15
21+
rm -rf musl-1.1.15 && \
22+
# Install linux kernel headers sanitized for use with musl
23+
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
24+
tar xzf - && \
25+
cd kernel-headers-3.12.6-5 && \
26+
make ARCH=i386 prefix=/musl-i686 install -j4 && \
27+
cd .. && \
28+
rm -rf kernel-headers-3.12.6-5
2229
ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
2330
CC_i686_unknown_linux_musl=musl-gcc

‎ci/docker/mips-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \

‎ci/docker/mips-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \

‎ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \

‎ci/docker/mipsel-unknown-linux-musl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \

‎ci/docker/powerpc-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \

‎ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \

‎ci/docker/s390x-unknown-linux-gnu/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
FROM ubuntu:17.10
2+
3+
RUN apt-get update && apt-get install -y --no-install-recommends \
4+
gcc libc6-dev qemu-user ca-certificates \
5+
gcc-s390x-linux-gnu libc6-dev-s390x-cross
6+
7+
ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
8+
CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
9+
PATH=$PATH:/rust/bin

‎ci/docker/x86_64-linux-android/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
1717
# We do not run x86_64-linux-android tests on an android emulator.
1818
# See ci/android-sysimage.sh for informations about how tests are run.
1919
COPY android-sysimage.sh /android/
20-
RUN bash /android/android-sysimage.sh x86_64 x86_64-21_r04.zip
20+
RUN bash /android/android-sysimage.sh x86_64 x86_64-24_r07.zip
2121

2222
ENV PATH=$PATH:/rust/bin:/android/ndk-$ANDROID_ARCH/bin \
2323
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \

‎ci/docker/x86_64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.10
1+
FROM ubuntu:17.10
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc libc6-dev ca-certificates

0 commit comments

Comments
 (0)