Auto merge of #1337 - gnzlbg:update_ubuntu, r=gnzlbg

Update CI from ubuntu 16.04 (EOL) to 19.04

Closes #1333 .
This commit is contained in:
bors 2019-05-16 09:04:07 +00:00
commit 4ac8346b74
55 changed files with 1725 additions and 1007 deletions

View File

@ -204,7 +204,7 @@ matrix:
stage: tier2 stage: tier2
- env: TARGET=x86_64-unknown-linux-musl - env: TARGET=x86_64-unknown-linux-musl
stage: tier2 stage: tier2
- env: TARGET=wasm32-unknown-wasi - env: TARGET=wasm32-wasi
rust: nightly rust: nightly
stage: tier2 stage: tier2

View File

@ -45,6 +45,9 @@ case "$1" in
;; ;;
esac; esac;
# See: https://stackoverflow.com/a/51644855/1422197
export JAVA_OPTS='-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee'
# --no_https avoids # --no_https avoids
# javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found # javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found
yes | ./sdk/tools/bin/sdkmanager --licenses --no_https yes | ./sdk/tools/bin/sdkmanager --licenses --no_https

View File

@ -115,6 +115,7 @@ aarch64-fuchsia \
armv5te-unknown-linux-gnueabi \ armv5te-unknown-linux-gnueabi \
armv5te-unknown-linux-musleabi \ armv5te-unknown-linux-musleabi \
i686-pc-windows-gnu \ i686-pc-windows-gnu \
wasm32-wasi \
x86_64-fortanix-unknown-sgx \ x86_64-fortanix-unknown-sgx \
x86_64-fuchsia \ x86_64-fuchsia \
x86_64-pc-windows-gnu \ x86_64-pc-windows-gnu \
@ -199,7 +200,6 @@ thumbv7neon-linux-androideabi \
thumbv7neon-unknown-linux-gnueabihf \ thumbv7neon-unknown-linux-gnueabihf \
thumbv8m.main-none-eabi \ thumbv8m.main-none-eabi \
x86_64-pc-windows-msvc x86_64-pc-windows-msvc
x86_64-unknown-bitrig \
x86_64-unknown-dragonfly \ x86_64-unknown-dragonfly \
x86_64-unknown-haiku \ x86_64-unknown-haiku \
x86_64-unknown-hermit \ x86_64-unknown-hermit \

View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:19.04
RUN dpkg --add-architecture i386 && \ RUN dpkg --add-architecture i386 && \
apt-get update && \ apt-get update && \
@ -9,7 +9,7 @@ RUN dpkg --add-architecture i386 && \
python \ python \
unzip \ unzip \
expect \ expect \
openjdk-9-jre \ openjdk-11-jre \
libstdc++6:i386 \ libstdc++6:i386 \
libpulse0 \ libpulse0 \
gcc \ gcc \

View File

@ -1,4 +1,4 @@
FROM ubuntu:17.10 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc make libc6-dev git curl ca-certificates \ gcc make libc6-dev git curl ca-certificates \

View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:19.04
RUN dpkg --add-architecture i386 && \ RUN dpkg --add-architecture i386 && \
apt-get update && \ apt-get update && \
@ -9,7 +9,7 @@ RUN dpkg --add-architecture i386 && \
python \ python \
unzip \ unzip \
expect \ expect \
openjdk-9-jre \ openjdk-11-jre \
libstdc++6:i386 \ libstdc++6:i386 \
libpulse0 \ libpulse0 \
gcc \ gcc \

View File

@ -1,4 +1,4 @@
FROM ubuntu:17.10 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates \ gcc libc6-dev ca-certificates \
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc make libc6-dev git curl ca-certificates \ gcc make libc6-dev git curl ca-certificates \

View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:19.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \

View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:19.04
RUN dpkg --add-architecture i386 && \ RUN dpkg --add-architecture i386 && \
apt-get update && \ apt-get update && \
@ -9,7 +9,7 @@ RUN dpkg --add-architecture i386 && \
python \ python \
unzip \ unzip \
expect \ expect \
openjdk-9-jre \ openjdk-11-jre \
libstdc++6:i386 \ libstdc++6:i386 \
libpulse0 \ libpulse0 \
gcc \ gcc \

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update RUN apt-get update
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
gcc-multilib libc6-dev ca-certificates gcc-multilib libc6-dev ca-certificates

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN dpkg --add-architecture i386 RUN dpkg --add-architecture i386
RUN apt-get update RUN apt-get update

View File

@ -1,4 +1,4 @@
FROM ubuntu:17.10 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \ gcc libc6-dev qemu-user ca-certificates \

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \ gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \

View File

@ -1,4 +1,4 @@
FROM ubuntu:17.10 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \ gcc libc6-dev qemu-user ca-certificates \

View File

@ -1,4 +1,4 @@
FROM ubuntu:17.10 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \ gcc libc6-dev qemu-user ca-certificates \

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \ gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \ gcc libc6-dev qemu-user ca-certificates \

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \ gcc libc6-dev qemu-user ca-certificates \

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
gcc libc6-dev qemu-user ca-certificates \ gcc libc6-dev qemu-user ca-certificates \

View File

@ -1,4 +1,4 @@
FROM ubuntu:17.10 FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
curl ca-certificates \ curl ca-certificates \

View File

@ -1,14 +1,11 @@
FROM debian:stretch FROM ubuntu:19.04
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
curl ca-certificates \ curl ca-certificates \
gcc libc6-dev \ gcc libc6-dev \
gcc-sparc64-linux-gnu libc6-dev-sparc64-cross \ gcc-sparc64-linux-gnu libc6-dev-sparc64-cross \
qemu-system-sparc64 openbios-sparc seabios ipxe-qemu \ qemu-system-sparc64 openbios-sparc seabios ipxe-qemu \
p7zip-full cpio linux-libc-dev-sparc64-cross linux-headers-4.9.0-3-common p7zip-full cpio linux-libc-dev-sparc64-cross
# Put linux/module.h into the right spot as it is not shipped by debian
RUN cp /usr/src/linux-headers-4.9.0-3-common/include/uapi/linux/module.h /usr/sparc64-linux-gnu/include/linux/
COPY linux-sparc64.sh / COPY linux-sparc64.sh /
RUN bash /linux-sparc64.sh RUN bash /linux-sparc64.sh

View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:19.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \

View File

@ -1,2 +0,0 @@
#!/usr/bin/env sh
exec /wasmcc/bin/clang --target=wasm32-unknown-wasi --sysroot /wasi-sysroot "$@"

View File

@ -28,13 +28,13 @@ RUN mv /clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-18.04 /wasmcc
# those breaking changes on `libc`'s own CI # those breaking changes on `libc`'s own CI
RUN git clone https://github.com/CraneStation/wasi-sysroot && \ RUN git clone https://github.com/CraneStation/wasi-sysroot && \
cd wasi-sysroot && \ cd wasi-sysroot && \
git reset --hard 2201343c17b7149a75f543f523bea0c3243c6091 git reset --hard eee6ee7566e26f2535eb6088c8494a112ff423b9
RUN make -C wasi-sysroot install -j $(nproc) WASM_CC=/wasmcc/bin/clang INSTALL_DIR=/wasi-sysroot RUN make -C wasi-sysroot install -j $(nproc) WASM_CC=/wasmcc/bin/clang INSTALL_DIR=/wasi-sysroot
# This is a small wrapper script which executes the actual clang binary in # This is a small wrapper script which executes the actual clang binary in
# `/wasmcc` and then is sure to pass the right `--sysroot` argument which we # `/wasmcc` and then is sure to pass the right `--sysroot` argument which we
# just built above. # just built above.
COPY docker/wasm32-unknown-wasi/clang.sh /wasi-sysroot/bin/clang COPY docker/wasm32-wasi/clang.sh /wasi-sysroot/bin/clang
# In the second container we're going to build the `wasmtime` binary which is # In the second container we're going to build the `wasmtime` binary which is
# used to execute wasi executables. This is a standard Rust project so we're # used to execute wasi executables. This is a standard Rust project so we're
@ -58,9 +58,9 @@ RUN curl -sSf https://sh.rustup.rs | sh -s -- -y
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH
RUN apt-get install -y --no-install-recommends python RUN apt-get install -y --no-install-recommends python
RUN git clone https://github.com/CraneStation/wasmtime wasmtime && \ RUN git clone --recursive https://github.com/CraneStation/wasmtime wasmtime && \
cd wasmtime && \ cd wasmtime && \
git reset --hard a1c123c3dd8f9766990efe0f1734a646f61ba8a0 git reset --hard 67edb00f29b62864b00179fe4bfa99bc29973285
RUN cargo build --release --manifest-path wasmtime/Cargo.toml RUN cargo build --release --manifest-path wasmtime/Cargo.toml
# And finally in the last image we're going to assemble everything together. # And finally in the last image we're going to assemble everything together.
@ -86,8 +86,8 @@ COPY --from=wasmtime /wasmtime/target/release/wasmtime /usr/bin/
# executable with the right sysroot, and then we're sure to turn off the # executable with the right sysroot, and then we're sure to turn off the
# crt-static feature to ensure that the CRT that we're specifying with `clang` # crt-static feature to ensure that the CRT that we're specifying with `clang`
# is used. # is used.
ENV CARGO_TARGET_WASM32_UNKNOWN_WASI_RUNNER=wasmtime \ ENV CARGO_TARGET_WASM32_WASI_RUNNER=wasmtime \
CARGO_TARGET_WASM32_UNKNOWN_WASI_LINKER=/wasi-sysroot/bin/clang \ CARGO_TARGET_WASM32_WASI_LINKER=/wasi-sysroot/bin/clang \
CC_wasm32_unknown_wasi=/wasi-sysroot/bin/clang \ CC_wasm32_wasi=/wasi-sysroot/bin/clang \
PATH=$PATH:/rust/bin \ PATH=$PATH:/rust/bin \
RUSTFLAGS=-Ctarget-feature=-crt-static RUSTFLAGS=-Ctarget-feature=-crt-static

2
ci/docker/wasm32-wasi/clang.sh Executable file
View File

@ -0,0 +1,2 @@
#!/usr/bin/env sh
exec /wasmcc/bin/clang --target=wasm32-wasi --sysroot /wasi-sysroot "$@"

View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:19.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update RUN apt-get update
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
gcc libc6-dev ca-certificates gcc libc6-dev ca-certificates

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update RUN apt-get update
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \
gcc-multilib libc6-dev ca-certificates gcc-multilib libc6-dev ca-certificates

View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update RUN apt-get update
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends \

View File

@ -6,8 +6,8 @@ mkdir -m 777 /qemu
cd /qemu cd /qemu
curl --retry 5 -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img curl --retry 5 -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20170828/images/generic/kernel.debian curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20190410/images/generic/kernel.debian
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20170828/images/generic/initrd.debian curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20190410/images/generic/initrd.debian
mv kernel.debian kernel mv kernel.debian kernel
mv initrd.debian initrd.gz mv initrd.debian initrd.gz

View File

@ -5,11 +5,11 @@ set -ex
mkdir -m 777 /qemu mkdir -m 777 /qemu
cd /qemu cd /qemu
curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/9.0/sparc64/iso-cd/debian-9.0-sparc64-NETINST-1.iso curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/10.0/sparc64/iso-cd/debian-10.0-sparc64-NETINST-1.iso
7z e debian-9.0-sparc64-NETINST-1.iso boot/initrd.gz 7z e debian-10.0-sparc64-NETINST-1.iso boot/initrd.gz
7z e debian-9.0-sparc64-NETINST-1.iso boot/sparc64 7z e debian-10.0-sparc64-NETINST-1.iso boot/sparc64
mv sparc64 kernel mv sparc64 kernel
rm debian-9.0-sparc64-NETINST-1.iso rm debian-10.0-sparc64-NETINST-1.iso
mkdir init mkdir init
cd init cd init

File diff suppressed because it is too large Load Diff

View File

@ -663,8 +663,7 @@ cfg_if! {
if #[cfg(any(target_os = "macos", target_os = "ios"))] { if #[cfg(any(target_os = "macos", target_os = "ios"))] {
mod apple; mod apple;
pub use self::apple::*; pub use self::apple::*;
} else if #[cfg(any(target_os = "openbsd", target_os = "netbsd", } else if #[cfg(any(target_os = "openbsd", target_os = "netbsd"))] {
target_os = "bitrig"))] {
mod netbsdlike; mod netbsdlike;
pub use self::netbsdlike::*; pub use self::netbsdlike::*;
} else if #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] { } else if #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] {

View File

@ -676,7 +676,7 @@ cfg_if! {
if #[cfg(target_os = "netbsd")] { if #[cfg(target_os = "netbsd")] {
mod netbsd; mod netbsd;
pub use self::netbsd::*; pub use self::netbsd::*;
} else if #[cfg(any(target_os = "openbsd", target_os = "bitrig"))] { } else if #[cfg(target_os = "openbsd")] {
mod openbsdlike; mod openbsdlike;
pub use self::openbsdlike::*; pub use self::openbsdlike::*;
} else { } else {

View File

@ -1,129 +0,0 @@
pub type c_char = i8;
s! {
pub struct glob_t {
pub gl_pathc: ::c_int,
pub gl_matchc: ::c_int,
pub gl_offs: ::c_int,
pub gl_flags: ::c_int,
pub gl_pathv: *mut *mut ::c_char,
__unused1: *mut ::c_void,
__unused2: *mut ::c_void,
__unused3: *mut ::c_void,
__unused4: *mut ::c_void,
__unused5: *mut ::c_void,
__unused6: *mut ::c_void,
__unused7: *mut ::c_void,
}
pub struct lconv {
pub decimal_point: *mut ::c_char,
pub thousands_sep: *mut ::c_char,
pub grouping: *mut ::c_char,
pub int_curr_symbol: *mut ::c_char,
pub currency_symbol: *mut ::c_char,
pub mon_decimal_point: *mut ::c_char,
pub mon_thousands_sep: *mut ::c_char,
pub mon_grouping: *mut ::c_char,
pub positive_sign: *mut ::c_char,
pub negative_sign: *mut ::c_char,
pub int_frac_digits: ::c_char,
pub frac_digits: ::c_char,
pub p_cs_precedes: ::c_char,
pub p_sep_by_space: ::c_char,
pub n_cs_precedes: ::c_char,
pub n_sep_by_space: ::c_char,
pub p_sign_posn: ::c_char,
pub n_sign_posn: ::c_char,
pub int_p_cs_precedes: ::c_char,
pub int_n_cs_precedes: ::c_char,
pub int_p_sep_by_space: ::c_char,
pub int_n_sep_by_space: ::c_char,
pub int_p_sign_posn: ::c_char,
pub int_n_sign_posn: ::c_char,
}
}
pub const LC_COLLATE_MASK: ::c_int = (1 << 0);
pub const LC_CTYPE_MASK: ::c_int = (1 << 1);
pub const LC_MESSAGES_MASK: ::c_int = (1 << 2);
pub const LC_MONETARY_MASK: ::c_int = (1 << 3);
pub const LC_NUMERIC_MASK: ::c_int = (1 << 4);
pub const LC_TIME_MASK: ::c_int = (1 << 5);
pub const LC_ALL_MASK: ::c_int = LC_COLLATE_MASK
| LC_CTYPE_MASK
| LC_MESSAGES_MASK
| LC_MONETARY_MASK
| LC_NUMERIC_MASK
| LC_TIME_MASK;
pub const ERA: ::nl_item = 52;
pub const ERA_D_FMT: ::nl_item = 53;
pub const ERA_D_T_FMT: ::nl_item = 54;
pub const ERA_T_FMT: ::nl_item = 55;
pub const ALT_DIGITS: ::nl_item = 56;
pub const D_MD_ORDER: ::nl_item = 57;
pub const ALTMON_1: ::nl_item = 58;
pub const ALTMON_2: ::nl_item = 59;
pub const ALTMON_3: ::nl_item = 60;
pub const ALTMON_4: ::nl_item = 61;
pub const ALTMON_5: ::nl_item = 62;
pub const ALTMON_6: ::nl_item = 63;
pub const ALTMON_7: ::nl_item = 64;
pub const ALTMON_8: ::nl_item = 65;
pub const ALTMON_9: ::nl_item = 66;
pub const ALTMON_10: ::nl_item = 67;
pub const ALTMON_11: ::nl_item = 68;
pub const ALTMON_12: ::nl_item = 69;
pub const KERN_RND: ::c_int = 31;
// https://github.com/bitrig/bitrig/blob/master/sys/net/if.h#L187
pub const IFF_UP: ::c_int = 0x1; // interface is up
pub const IFF_BROADCAST: ::c_int = 0x2; // broadcast address valid
pub const IFF_DEBUG: ::c_int = 0x4; // turn on debugging
pub const IFF_LOOPBACK: ::c_int = 0x8; // is a loopback net
pub const IFF_POINTOPOINT: ::c_int = 0x10; // interface is point-to-point link
pub const IFF_NOTRAILERS: ::c_int = 0x20; // avoid use of trailers
pub const IFF_RUNNING: ::c_int = 0x40; // resources allocated
pub const IFF_NOARP: ::c_int = 0x80; // no address resolution protocol
pub const IFF_PROMISC: ::c_int = 0x100; // receive all packets
pub const IFF_ALLMULTI: ::c_int = 0x200; // receive all multicast packets
pub const IFF_OACTIVE: ::c_int = 0x400; // transmission in progress
pub const IFF_SIMPLEX: ::c_int = 0x800; // can't hear own transmissions
pub const IFF_LINK0: ::c_int = 0x1000; // per link layer defined bit
pub const IFF_LINK1: ::c_int = 0x2000; // per link layer defined bit
pub const IFF_LINK2: ::c_int = 0x4000; // per link layer defined bit
pub const IFF_MULTICAST: ::c_int = 0x8000; // supports multicast
pub const PTHREAD_STACK_MIN : ::size_t = 2048;
pub const SIGSTKSZ : ::size_t = 40960;
pub const PT_FIRSTMACH: ::c_int = 32;
extern {
pub fn nl_langinfo_l(item: ::nl_item, locale: ::locale_t) -> *mut ::c_char;
pub fn duplocale(base: ::locale_t) -> ::locale_t;
pub fn freelocale(loc: ::locale_t) -> ::c_int;
pub fn newlocale(mask: ::c_int,
locale: *const ::c_char,
base: ::locale_t) -> ::locale_t;
pub fn uselocale(loc: ::locale_t) -> ::locale_t;
pub fn pledge(promises: *const ::c_char,
paths: *mut *const ::c_char) -> ::c_int;
pub fn querylocale(mask: ::c_int, loc: ::locale_t) -> *const ::c_char;
}
cfg_if! {
if #[cfg(target_arch = "x86")] {
mod x86;
pub use self::x86::*;
} else if #[cfg(target_arch = "x86_64")] {
mod x86_64;
pub use self::x86_64::*;
} else {
// Unknown target_arch
}
}

View File

@ -1,2 +0,0 @@
pub type c_long = i32;
pub type c_ulong = u32;

View File

@ -1,10 +0,0 @@
use PT_FIRSTMACH;
pub type c_long = i64;
pub type c_ulong = u64;
pub const PT_STEP: ::c_int = PT_FIRSTMACH + 0;
pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 1;
pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 2;
pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 3;
pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 4;

View File

@ -939,9 +939,6 @@ cfg_if! {
if #[cfg(target_os = "openbsd")] { if #[cfg(target_os = "openbsd")] {
mod openbsd; mod openbsd;
pub use self::openbsd::*; pub use self::openbsd::*;
} else if #[cfg(target_os = "bitrig")] {
mod bitrig;
pub use self::bitrig::*;
} else { } else {
// Unknown target_os // Unknown target_os
} }

View File

@ -327,8 +327,7 @@ cfg_if! {
} else if #[cfg(any(target_os = "macos", } else if #[cfg(any(target_os = "macos",
target_os = "ios", target_os = "ios",
target_os = "android", target_os = "android",
target_os = "openbsd", target_os = "openbsd"))] {
target_os = "bitrig"))] {
#[link(name = "c")] #[link(name = "c")]
#[link(name = "m")] #[link(name = "m")]
extern {} extern {}
@ -512,8 +511,11 @@ extern {
pub fn snprintf(s: *mut ::c_char, n: ::size_t, pub fn snprintf(s: *mut ::c_char, n: ::size_t,
format: *const ::c_char, ...) -> ::c_int; format: *const ::c_char, ...) -> ::c_int;
pub fn sprintf(s: *mut ::c_char, format: *const ::c_char, ...) -> ::c_int; pub fn sprintf(s: *mut ::c_char, format: *const ::c_char, ...) -> ::c_int;
#[cfg_attr(target_os = "linux", link_name = "__isoc99_fscanf")]
pub fn fscanf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int; pub fn fscanf(stream: *mut ::FILE, format: *const ::c_char, ...) -> ::c_int;
#[cfg_attr(target_os = "linux", link_name = "__isoc99_scanf")]
pub fn scanf(format: *const ::c_char, ...) -> ::c_int; pub fn scanf(format: *const ::c_char, ...) -> ::c_int;
#[cfg_attr(target_os = "linux", link_name = "__isoc99_sscanf")]
pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...) -> ::c_int; pub fn sscanf(s: *const ::c_char, format: *const ::c_char, ...) -> ::c_int;
pub fn getchar_unlocked() -> ::c_int; pub fn getchar_unlocked() -> ::c_int;
pub fn putchar_unlocked(c: ::c_int) -> ::c_int; pub fn putchar_unlocked(c: ::c_int) -> ::c_int;
@ -837,6 +839,14 @@ extern {
pub fn flock(fd: ::c_int, operation: ::c_int) -> ::c_int; pub fn flock(fd: ::c_int, operation: ::c_int) -> ::c_int;
#[cfg_attr(target_os = "netbsd", link_name = "__gettimeofday50")] #[cfg_attr(target_os = "netbsd", link_name = "__gettimeofday50")]
#[deprecated(
since="0.2.54",
note=
"The signature of this function is incorrect. \
If you are using it, please report that in the following issue \
so that we can evaluate the impact of fixing it: \
https://github.com/rust-lang/libc/issues/1338"
)]
pub fn gettimeofday(tp: *mut ::timeval, pub fn gettimeofday(tp: *mut ::timeval,
tz: *mut ::c_void) -> ::c_int; tz: *mut ::c_void) -> ::c_int;
#[cfg_attr(target_os = "netbsd", link_name = "__times13")] #[cfg_attr(target_os = "netbsd", link_name = "__times13")]
@ -1147,8 +1157,7 @@ cfg_if! {
target_os = "freebsd", target_os = "freebsd",
target_os = "dragonfly", target_os = "dragonfly",
target_os = "openbsd", target_os = "openbsd",
target_os = "netbsd", target_os = "netbsd"))] {
target_os = "bitrig"))] {
mod bsd; mod bsd;
pub use self::bsd::*; pub use self::bsd::*;
} else if #[cfg(any(target_os = "solaris", } else if #[cfg(any(target_os = "solaris",

View File

@ -7,8 +7,7 @@ macro_rules! expand_align {
target_arch = "mips64", target_arch = "mips64",
target_arch = "s390x", target_arch = "s390x",
target_arch = "sparc64", target_arch = "sparc64",
all(target_arch = "aarch64", target_arch = "aarch64"),
target_env = "musl")),
repr(align(4)))] repr(align(4)))]
#[cfg_attr(not(any(target_pointer_width = "32", #[cfg_attr(not(any(target_pointer_width = "32",
target_arch = "x86_64", target_arch = "x86_64",
@ -16,8 +15,7 @@ macro_rules! expand_align {
target_arch = "mips64", target_arch = "mips64",
target_arch = "s390x", target_arch = "s390x",
target_arch = "sparc64", target_arch = "sparc64",
all(target_arch = "aarch64", target_arch = "aarch64")),
target_env = "musl"))),
repr(align(8)))] repr(align(8)))]
pub struct pthread_mutexattr_t { pub struct pthread_mutexattr_t {
#[doc(hidden)] #[doc(hidden)]

View File

@ -353,7 +353,6 @@ pub const SYS_mknod: ::c_long = 4000 + 14;
pub const SYS_chmod: ::c_long = 4000 + 15; pub const SYS_chmod: ::c_long = 4000 + 15;
pub const SYS_lchown: ::c_long = 4000 + 16; pub const SYS_lchown: ::c_long = 4000 + 16;
pub const SYS_break: ::c_long = 4000 + 17; pub const SYS_break: ::c_long = 4000 + 17;
pub const SYS_unused18: ::c_long = 4000 + 18;
pub const SYS_lseek: ::c_long = 4000 + 19; pub const SYS_lseek: ::c_long = 4000 + 19;
pub const SYS_getpid: ::c_long = 4000 + 20; pub const SYS_getpid: ::c_long = 4000 + 20;
pub const SYS_mount: ::c_long = 4000 + 21; pub const SYS_mount: ::c_long = 4000 + 21;
@ -363,7 +362,6 @@ pub const SYS_getuid: ::c_long = 4000 + 24;
pub const SYS_stime: ::c_long = 4000 + 25; pub const SYS_stime: ::c_long = 4000 + 25;
pub const SYS_ptrace: ::c_long = 4000 + 26; pub const SYS_ptrace: ::c_long = 4000 + 26;
pub const SYS_alarm: ::c_long = 4000 + 27; pub const SYS_alarm: ::c_long = 4000 + 27;
pub const SYS_unused28: ::c_long = 4000 + 28;
pub const SYS_pause: ::c_long = 4000 + 29; pub const SYS_pause: ::c_long = 4000 + 29;
pub const SYS_utime: ::c_long = 4000 + 30; pub const SYS_utime: ::c_long = 4000 + 30;
pub const SYS_stty: ::c_long = 4000 + 31; pub const SYS_stty: ::c_long = 4000 + 31;
@ -394,7 +392,6 @@ pub const SYS_fcntl: ::c_long = 4000 + 55;
pub const SYS_mpx: ::c_long = 4000 + 56; pub const SYS_mpx: ::c_long = 4000 + 56;
pub const SYS_setpgid: ::c_long = 4000 + 57; pub const SYS_setpgid: ::c_long = 4000 + 57;
pub const SYS_ulimit: ::c_long = 4000 + 58; pub const SYS_ulimit: ::c_long = 4000 + 58;
pub const SYS_unused59: ::c_long = 4000 + 59;
pub const SYS_umask: ::c_long = 4000 + 60; pub const SYS_umask: ::c_long = 4000 + 60;
pub const SYS_chroot: ::c_long = 4000 + 61; pub const SYS_chroot: ::c_long = 4000 + 61;
pub const SYS_ustat: ::c_long = 4000 + 62; pub const SYS_ustat: ::c_long = 4000 + 62;
@ -417,9 +414,7 @@ pub const SYS_gettimeofday: ::c_long = 4000 + 78;
pub const SYS_settimeofday: ::c_long = 4000 + 79; pub const SYS_settimeofday: ::c_long = 4000 + 79;
pub const SYS_getgroups: ::c_long = 4000 + 80; pub const SYS_getgroups: ::c_long = 4000 + 80;
pub const SYS_setgroups: ::c_long = 4000 + 81; pub const SYS_setgroups: ::c_long = 4000 + 81;
pub const SYS_reserved82: ::c_long = 4000 + 82;
pub const SYS_symlink: ::c_long = 4000 + 83; pub const SYS_symlink: ::c_long = 4000 + 83;
pub const SYS_unused84: ::c_long = 4000 + 84;
pub const SYS_readlink: ::c_long = 4000 + 85; pub const SYS_readlink: ::c_long = 4000 + 85;
pub const SYS_uselib: ::c_long = 4000 + 86; pub const SYS_uselib: ::c_long = 4000 + 86;
pub const SYS_swapon: ::c_long = 4000 + 87; pub const SYS_swapon: ::c_long = 4000 + 87;
@ -444,7 +439,6 @@ pub const SYS_getitimer: ::c_long = 4000 + 105;
pub const SYS_stat: ::c_long = 4000 + 106; pub const SYS_stat: ::c_long = 4000 + 106;
pub const SYS_lstat: ::c_long = 4000 + 107; pub const SYS_lstat: ::c_long = 4000 + 107;
pub const SYS_fstat: ::c_long = 4000 + 108; pub const SYS_fstat: ::c_long = 4000 + 108;
pub const SYS_unused109: ::c_long = 4000 + 109;
pub const SYS_iopl: ::c_long = 4000 + 110; pub const SYS_iopl: ::c_long = 4000 + 110;
pub const SYS_vhangup: ::c_long = 4000 + 111; pub const SYS_vhangup: ::c_long = 4000 + 111;
pub const SYS_idle: ::c_long = 4000 + 112; pub const SYS_idle: ::c_long = 4000 + 112;
@ -485,7 +479,6 @@ pub const SYS_writev: ::c_long = 4000 + 146;
pub const SYS_cacheflush: ::c_long = 4000 + 147; pub const SYS_cacheflush: ::c_long = 4000 + 147;
pub const SYS_cachectl: ::c_long = 4000 + 148; pub const SYS_cachectl: ::c_long = 4000 + 148;
pub const SYS_sysmips: ::c_long = 4000 + 149; pub const SYS_sysmips: ::c_long = 4000 + 149;
pub const SYS_unused150: ::c_long = 4000 + 150;
pub const SYS_getsid: ::c_long = 4000 + 151; pub const SYS_getsid: ::c_long = 4000 + 151;
pub const SYS_fdatasync: ::c_long = 4000 + 152; pub const SYS_fdatasync: ::c_long = 4000 + 152;
pub const SYS__sysctl: ::c_long = 4000 + 153; pub const SYS__sysctl: ::c_long = 4000 + 153;
@ -556,7 +549,6 @@ pub const SYS_mincore: ::c_long = 4000 + 217;
pub const SYS_madvise: ::c_long = 4000 + 218; pub const SYS_madvise: ::c_long = 4000 + 218;
pub const SYS_getdents64: ::c_long = 4000 + 219; pub const SYS_getdents64: ::c_long = 4000 + 219;
pub const SYS_fcntl64: ::c_long = 4000 + 220; pub const SYS_fcntl64: ::c_long = 4000 + 220;
pub const SYS_reserved221: ::c_long = 4000 + 221;
pub const SYS_gettid: ::c_long = 4000 + 222; pub const SYS_gettid: ::c_long = 4000 + 222;
pub const SYS_readahead: ::c_long = 4000 + 223; pub const SYS_readahead: ::c_long = 4000 + 223;
pub const SYS_setxattr: ::c_long = 4000 + 224; pub const SYS_setxattr: ::c_long = 4000 + 224;

View File

@ -496,7 +496,6 @@ pub const SYS_nfsservctl: ::c_long = 5000 + 173;
pub const SYS_getpmsg: ::c_long = 5000 + 174; pub const SYS_getpmsg: ::c_long = 5000 + 174;
pub const SYS_putpmsg: ::c_long = 5000 + 175; pub const SYS_putpmsg: ::c_long = 5000 + 175;
pub const SYS_afs_syscall: ::c_long = 5000 + 176; pub const SYS_afs_syscall: ::c_long = 5000 + 176;
pub const SYS_reserved177: ::c_long = 5000 + 177;
pub const SYS_gettid: ::c_long = 5000 + 178; pub const SYS_gettid: ::c_long = 5000 + 178;
pub const SYS_readahead: ::c_long = 5000 + 179; pub const SYS_readahead: ::c_long = 5000 + 179;
pub const SYS_setxattr: ::c_long = 5000 + 180; pub const SYS_setxattr: ::c_long = 5000 + 180;
@ -512,7 +511,6 @@ pub const SYS_removexattr: ::c_long = 5000 + 189;
pub const SYS_lremovexattr: ::c_long = 5000 + 190; pub const SYS_lremovexattr: ::c_long = 5000 + 190;
pub const SYS_fremovexattr: ::c_long = 5000 + 191; pub const SYS_fremovexattr: ::c_long = 5000 + 191;
pub const SYS_tkill: ::c_long = 5000 + 192; pub const SYS_tkill: ::c_long = 5000 + 192;
pub const SYS_reserved193: ::c_long = 5000 + 193;
pub const SYS_futex: ::c_long = 5000 + 194; pub const SYS_futex: ::c_long = 5000 + 194;
pub const SYS_sched_setaffinity: ::c_long = 5000 + 195; pub const SYS_sched_setaffinity: ::c_long = 5000 + 195;
pub const SYS_sched_getaffinity: ::c_long = 5000 + 196; pub const SYS_sched_getaffinity: ::c_long = 5000 + 196;

View File

@ -706,10 +706,10 @@ pub const GENL_UNS_ADMIN_PERM: ::c_int = 0x10;
pub const GENL_ID_VFS_DQUOT: ::c_int = ::NLMSG_MIN_TYPE + 1; pub const GENL_ID_VFS_DQUOT: ::c_int = ::NLMSG_MIN_TYPE + 1;
pub const GENL_ID_PMCRAID: ::c_int = ::NLMSG_MIN_TYPE + 2; pub const GENL_ID_PMCRAID: ::c_int = ::NLMSG_MIN_TYPE + 2;
pub const NFT_TABLE_MAXNAMELEN: ::c_int = 32; pub const NFT_TABLE_MAXNAMELEN: ::c_int = 256;
pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 32; pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 256;
pub const NFT_SET_MAXNAMELEN: ::c_int = 32; pub const NFT_SET_MAXNAMELEN: ::c_int = 256;
pub const NFT_OBJ_MAXNAMELEN: ::c_int = 32; pub const NFT_OBJ_MAXNAMELEN: ::c_int = 256;
pub const NFT_USERDATA_MAXLEN: ::c_int = 256; pub const NFT_USERDATA_MAXLEN: ::c_int = 256;
pub const NFT_REG_VERDICT: ::c_int = 0; pub const NFT_REG_VERDICT: ::c_int = 0;
@ -766,7 +766,7 @@ pub const NFT_MSG_NEWOBJ: ::c_int = 18;
pub const NFT_MSG_GETOBJ: ::c_int = 19; pub const NFT_MSG_GETOBJ: ::c_int = 19;
pub const NFT_MSG_DELOBJ: ::c_int = 20; pub const NFT_MSG_DELOBJ: ::c_int = 20;
pub const NFT_MSG_GETOBJ_RESET: ::c_int = 21; pub const NFT_MSG_GETOBJ_RESET: ::c_int = 21;
pub const NFT_MSG_MAX: ::c_int = 22; pub const NFT_MSG_MAX: ::c_int = 25;
pub const NFT_SET_ANONYMOUS: ::c_int = 0x1; pub const NFT_SET_ANONYMOUS: ::c_int = 0x1;
pub const NFT_SET_CONSTANT: ::c_int = 0x2; pub const NFT_SET_CONSTANT: ::c_int = 0x2;

View File

@ -514,7 +514,6 @@ pub const SYS_mknod: ::c_long = 4000 + 14;
pub const SYS_chmod: ::c_long = 4000 + 15; pub const SYS_chmod: ::c_long = 4000 + 15;
pub const SYS_lchown: ::c_long = 4000 + 16; pub const SYS_lchown: ::c_long = 4000 + 16;
pub const SYS_break: ::c_long = 4000 + 17; pub const SYS_break: ::c_long = 4000 + 17;
pub const SYS_unused18: ::c_long = 4000 + 18;
pub const SYS_lseek: ::c_long = 4000 + 19; pub const SYS_lseek: ::c_long = 4000 + 19;
pub const SYS_getpid: ::c_long = 4000 + 20; pub const SYS_getpid: ::c_long = 4000 + 20;
pub const SYS_mount: ::c_long = 4000 + 21; pub const SYS_mount: ::c_long = 4000 + 21;
@ -524,7 +523,6 @@ pub const SYS_getuid: ::c_long = 4000 + 24;
pub const SYS_stime: ::c_long = 4000 + 25; pub const SYS_stime: ::c_long = 4000 + 25;
pub const SYS_ptrace: ::c_long = 4000 + 26; pub const SYS_ptrace: ::c_long = 4000 + 26;
pub const SYS_alarm: ::c_long = 4000 + 27; pub const SYS_alarm: ::c_long = 4000 + 27;
pub const SYS_unused28: ::c_long = 4000 + 28;
pub const SYS_pause: ::c_long = 4000 + 29; pub const SYS_pause: ::c_long = 4000 + 29;
pub const SYS_utime: ::c_long = 4000 + 30; pub const SYS_utime: ::c_long = 4000 + 30;
pub const SYS_stty: ::c_long = 4000 + 31; pub const SYS_stty: ::c_long = 4000 + 31;
@ -555,7 +553,6 @@ pub const SYS_fcntl: ::c_long = 4000 + 55;
pub const SYS_mpx: ::c_long = 4000 + 56; pub const SYS_mpx: ::c_long = 4000 + 56;
pub const SYS_setpgid: ::c_long = 4000 + 57; pub const SYS_setpgid: ::c_long = 4000 + 57;
pub const SYS_ulimit: ::c_long = 4000 + 58; pub const SYS_ulimit: ::c_long = 4000 + 58;
pub const SYS_unused59: ::c_long = 4000 + 59;
pub const SYS_umask: ::c_long = 4000 + 60; pub const SYS_umask: ::c_long = 4000 + 60;
pub const SYS_chroot: ::c_long = 4000 + 61; pub const SYS_chroot: ::c_long = 4000 + 61;
pub const SYS_ustat: ::c_long = 4000 + 62; pub const SYS_ustat: ::c_long = 4000 + 62;
@ -578,9 +575,7 @@ pub const SYS_gettimeofday: ::c_long = 4000 + 78;
pub const SYS_settimeofday: ::c_long = 4000 + 79; pub const SYS_settimeofday: ::c_long = 4000 + 79;
pub const SYS_getgroups: ::c_long = 4000 + 80; pub const SYS_getgroups: ::c_long = 4000 + 80;
pub const SYS_setgroups: ::c_long = 4000 + 81; pub const SYS_setgroups: ::c_long = 4000 + 81;
pub const SYS_reserved82: ::c_long = 4000 + 82;
pub const SYS_symlink: ::c_long = 4000 + 83; pub const SYS_symlink: ::c_long = 4000 + 83;
pub const SYS_unused84: ::c_long = 4000 + 84;
pub const SYS_readlink: ::c_long = 4000 + 85; pub const SYS_readlink: ::c_long = 4000 + 85;
pub const SYS_uselib: ::c_long = 4000 + 86; pub const SYS_uselib: ::c_long = 4000 + 86;
pub const SYS_swapon: ::c_long = 4000 + 87; pub const SYS_swapon: ::c_long = 4000 + 87;
@ -605,7 +600,6 @@ pub const SYS_getitimer: ::c_long = 4000 + 105;
pub const SYS_stat: ::c_long = 4000 + 106; pub const SYS_stat: ::c_long = 4000 + 106;
pub const SYS_lstat: ::c_long = 4000 + 107; pub const SYS_lstat: ::c_long = 4000 + 107;
pub const SYS_fstat: ::c_long = 4000 + 108; pub const SYS_fstat: ::c_long = 4000 + 108;
pub const SYS_unused109: ::c_long = 4000 + 109;
pub const SYS_iopl: ::c_long = 4000 + 110; pub const SYS_iopl: ::c_long = 4000 + 110;
pub const SYS_vhangup: ::c_long = 4000 + 111; pub const SYS_vhangup: ::c_long = 4000 + 111;
pub const SYS_idle: ::c_long = 4000 + 112; pub const SYS_idle: ::c_long = 4000 + 112;
@ -645,7 +639,6 @@ pub const SYS_writev: ::c_long = 4000 + 146;
pub const SYS_cacheflush: ::c_long = 4000 + 147; pub const SYS_cacheflush: ::c_long = 4000 + 147;
pub const SYS_cachectl: ::c_long = 4000 + 148; pub const SYS_cachectl: ::c_long = 4000 + 148;
pub const SYS_sysmips: ::c_long = 4000 + 149; pub const SYS_sysmips: ::c_long = 4000 + 149;
pub const SYS_unused150: ::c_long = 4000 + 150;
pub const SYS_getsid: ::c_long = 4000 + 151; pub const SYS_getsid: ::c_long = 4000 + 151;
pub const SYS_fdatasync: ::c_long = 4000 + 152; pub const SYS_fdatasync: ::c_long = 4000 + 152;
pub const SYS__sysctl: ::c_long = 4000 + 153; pub const SYS__sysctl: ::c_long = 4000 + 153;
@ -714,7 +707,6 @@ pub const SYS_mincore: ::c_long = 4000 + 217;
pub const SYS_madvise: ::c_long = 4000 + 218; pub const SYS_madvise: ::c_long = 4000 + 218;
pub const SYS_getdents64: ::c_long = 4000 + 219; pub const SYS_getdents64: ::c_long = 4000 + 219;
pub const SYS_fcntl64: ::c_long = 4000 + 220; pub const SYS_fcntl64: ::c_long = 4000 + 220;
pub const SYS_reserved221: ::c_long = 4000 + 221;
pub const SYS_gettid: ::c_long = 4000 + 222; pub const SYS_gettid: ::c_long = 4000 + 222;
pub const SYS_readahead: ::c_long = 4000 + 223; pub const SYS_readahead: ::c_long = 4000 + 223;
pub const SYS_setxattr: ::c_long = 4000 + 224; pub const SYS_setxattr: ::c_long = 4000 + 224;

View File

@ -136,9 +136,6 @@ pub const SO_RCVBUFFORCE: ::c_int = 33;
pub const FIOCLEX: ::c_ulong = 0x5451; pub const FIOCLEX: ::c_ulong = 0x5451;
pub const FIONBIO: ::c_ulong = 0x5421; pub const FIONBIO: ::c_ulong = 0x5421;
pub const PTRACE_GETFPXREGS: ::c_uint = 18;
pub const PTRACE_SETFPXREGS: ::c_uint = 19;
pub const MCL_CURRENT: ::c_int = 0x0001; pub const MCL_CURRENT: ::c_int = 0x0001;
pub const MCL_FUTURE: ::c_int = 0x0002; pub const MCL_FUTURE: ::c_int = 0x0002;

View File

@ -212,6 +212,7 @@ s_no_extra_traits!{
pub uc_mcontext: mcontext_t, pub uc_mcontext: mcontext_t,
pub uc_sigmask: ::sigset_t, pub uc_sigmask: ::sigset_t,
__private: [u8; 112], __private: [u8; 112],
__ssp: [::c_ulong; 4],
} }
} }

View File

@ -786,7 +786,6 @@ pub const SYS_rt_tgsigqueueinfo: ::c_long = 240;
pub const SYS_perf_event_open: ::c_long = 241; pub const SYS_perf_event_open: ::c_long = 241;
pub const SYS_accept4: ::c_long = 242; pub const SYS_accept4: ::c_long = 242;
pub const SYS_recvmmsg: ::c_long = 243; pub const SYS_recvmmsg: ::c_long = 243;
pub const SYS_arch_specific_syscall: ::c_long = 244;
pub const SYS_wait4: ::c_long = 260; pub const SYS_wait4: ::c_long = 260;
pub const SYS_prlimit64: ::c_long = 261; pub const SYS_prlimit64: ::c_long = 261;
pub const SYS_fanotify_init: ::c_long = 262; pub const SYS_fanotify_init: ::c_long = 262;
@ -818,7 +817,6 @@ pub const SYS_pwritev2: ::c_long = 287;
pub const SYS_pkey_mprotect: ::c_long = 288; pub const SYS_pkey_mprotect: ::c_long = 288;
pub const SYS_pkey_alloc: ::c_long = 289; pub const SYS_pkey_alloc: ::c_long = 289;
pub const SYS_pkey_free: ::c_long = 290; pub const SYS_pkey_free: ::c_long = 290;
pub const SYS_syscalls: ::c_long = 291;
#[link(name = "util")] #[link(name = "util")]
extern { extern {

View File

@ -495,7 +495,7 @@ pub const VEOL2: usize = 6;
pub const VMIN: usize = 4; pub const VMIN: usize = 4;
pub const IEXTEN: ::tcflag_t = 0x8000; pub const IEXTEN: ::tcflag_t = 0x8000;
pub const TOSTOP: ::tcflag_t = 0x100; pub const TOSTOP: ::tcflag_t = 0x100;
pub const FLUSHO: ::tcflag_t = 0x2000; pub const FLUSHO: ::tcflag_t = 0x1000;
pub const EXTPROC: ::tcflag_t = 0x10000; pub const EXTPROC: ::tcflag_t = 0x10000;
pub const TCGETS: ::c_ulong = 0x40245408; pub const TCGETS: ::c_ulong = 0x40245408;
pub const TCSETS: ::c_ulong = 0x80245409; pub const TCSETS: ::c_ulong = 0x80245409;

View File

@ -231,6 +231,7 @@ s_no_extra_traits! {
pub uc_mcontext: mcontext_t, pub uc_mcontext: mcontext_t,
pub uc_sigmask: ::sigset_t, pub uc_sigmask: ::sigset_t,
__private: [u8; 512], __private: [u8; 512],
__ssp: [::c_ulonglong; 4],
} }
} }

View File

@ -225,23 +225,19 @@ s_no_extra_traits! {
pub ut_exit: __exit_status, pub ut_exit: __exit_status,
#[cfg(any(target_arch = "aarch64", #[cfg(any(target_arch = "aarch64",
target_arch = "sparc64",
all(target_pointer_width = "32", all(target_pointer_width = "32",
not(target_arch = "x86_64"))))] not(target_arch = "x86_64"))))]
pub ut_session: ::c_long, pub ut_session: ::c_long,
#[cfg(any(target_arch = "aarch64", #[cfg(any(target_arch = "aarch64",
target_arch = "sparc64",
all(target_pointer_width = "32", all(target_pointer_width = "32",
not(target_arch = "x86_64"))))] not(target_arch = "x86_64"))))]
pub ut_tv: ::timeval, pub ut_tv: ::timeval,
#[cfg(not(any(target_arch = "aarch64", #[cfg(not(any(target_arch = "aarch64",
target_arch = "sparc64",
all(target_pointer_width = "32", all(target_pointer_width = "32",
not(target_arch = "x86_64")))))] not(target_arch = "x86_64")))))]
pub ut_session: ::int32_t, pub ut_session: ::int32_t,
#[cfg(not(any(target_arch = "aarch64", #[cfg(not(any(target_arch = "aarch64",
target_arch = "sparc64",
all(target_pointer_width = "32", all(target_pointer_width = "32",
not(target_arch = "x86_64")))))] not(target_arch = "x86_64")))))]
pub ut_tv: __timeval, pub ut_tv: __timeval,
@ -688,23 +684,10 @@ pub const NFPROTO_INET: ::c_int = 1;
pub const NFPROTO_NETDEV: ::c_int = 5; pub const NFPROTO_NETDEV: ::c_int = 5;
// linux/netfilter/nf_tables.h // linux/netfilter/nf_tables.h
cfg_if!{ pub const NFT_TABLE_MAXNAMELEN: ::c_int = 256;
if #[cfg(any(target_arch = "arm", target_arch = "aarch64"))] { pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 256;
pub const NFT_TABLE_MAXNAMELEN: ::c_int = 32; pub const NFT_SET_MAXNAMELEN: ::c_int = 256;
pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 32; pub const NFT_OBJ_MAXNAMELEN: ::c_int = 256;
pub const NFT_SET_MAXNAMELEN: ::c_int = 32;
pub const NFT_OBJ_MAXNAMELEN: ::c_int = 32;
} else if #[cfg(target_arch = "sparc64")] {
pub const NFT_TABLE_MAXNAMELEN: ::c_int = 32;
pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 32;
pub const NFT_SET_MAXNAMELEN: ::c_int = 32;
} else {
pub const NFT_TABLE_MAXNAMELEN: ::c_int = 256;
pub const NFT_CHAIN_MAXNAMELEN: ::c_int = 256;
pub const NFT_SET_MAXNAMELEN: ::c_int = 256;
pub const NFT_OBJ_MAXNAMELEN: ::c_int = 256;
}
}
pub const NFT_USERDATA_MAXLEN: ::c_int = 256; pub const NFT_USERDATA_MAXLEN: ::c_int = 256;
pub const NFT_REG_VERDICT: ::c_int = 0; pub const NFT_REG_VERDICT: ::c_int = 0;
@ -763,11 +746,9 @@ cfg_if! {
pub const NFT_MSG_GETOBJ: ::c_int = 19; pub const NFT_MSG_GETOBJ: ::c_int = 19;
pub const NFT_MSG_DELOBJ: ::c_int = 20; pub const NFT_MSG_DELOBJ: ::c_int = 20;
pub const NFT_MSG_GETOBJ_RESET: ::c_int = 21; pub const NFT_MSG_GETOBJ_RESET: ::c_int = 21;
pub const NFT_MSG_MAX: ::c_int = 22;
} else {
pub const NFT_MSG_MAX: ::c_int = 18;
} }
} }
pub const NFT_MSG_MAX: ::c_int = 25;
pub const NFT_SET_ANONYMOUS: ::c_int = 0x1; pub const NFT_SET_ANONYMOUS: ::c_int = 0x1;
pub const NFT_SET_CONSTANT: ::c_int = 0x2; pub const NFT_SET_CONSTANT: ::c_int = 0x2;

View File

@ -782,10 +782,6 @@ pub const PTRACE_POKEUSER: ::c_uint = 6;
pub const PTRACE_CONT: ::c_uint = 7; pub const PTRACE_CONT: ::c_uint = 7;
pub const PTRACE_KILL: ::c_uint = 8; pub const PTRACE_KILL: ::c_uint = 8;
pub const PTRACE_SINGLESTEP: ::c_uint = 9; pub const PTRACE_SINGLESTEP: ::c_uint = 9;
pub const PTRACE_GETREGS: ::c_uint = 12;
pub const PTRACE_SETREGS: ::c_uint = 13;
pub const PTRACE_GETFPREGS: ::c_uint = 14;
pub const PTRACE_SETFPREGS: ::c_uint = 15;
pub const PTRACE_ATTACH: ::c_uint = 16; pub const PTRACE_ATTACH: ::c_uint = 16;
pub const PTRACE_DETACH: ::c_uint = 17; pub const PTRACE_DETACH: ::c_uint = 17;
pub const PTRACE_SYSCALL: ::c_uint = 24; pub const PTRACE_SYSCALL: ::c_uint = 24;

View File

@ -247,7 +247,6 @@ pub const SYS_mknod: ::c_long = 4000 + 14;
pub const SYS_chmod: ::c_long = 4000 + 15; pub const SYS_chmod: ::c_long = 4000 + 15;
pub const SYS_lchown: ::c_long = 4000 + 16; pub const SYS_lchown: ::c_long = 4000 + 16;
pub const SYS_break: ::c_long = 4000 + 17; pub const SYS_break: ::c_long = 4000 + 17;
pub const SYS_unused18: ::c_long = 4000 + 18;
pub const SYS_lseek: ::c_long = 4000 + 19; pub const SYS_lseek: ::c_long = 4000 + 19;
pub const SYS_getpid: ::c_long = 4000 + 20; pub const SYS_getpid: ::c_long = 4000 + 20;
pub const SYS_mount: ::c_long = 4000 + 21; pub const SYS_mount: ::c_long = 4000 + 21;
@ -257,7 +256,6 @@ pub const SYS_getuid: ::c_long = 4000 + 24;
pub const SYS_stime: ::c_long = 4000 + 25; pub const SYS_stime: ::c_long = 4000 + 25;
pub const SYS_ptrace: ::c_long = 4000 + 26; pub const SYS_ptrace: ::c_long = 4000 + 26;
pub const SYS_alarm: ::c_long = 4000 + 27; pub const SYS_alarm: ::c_long = 4000 + 27;
pub const SYS_unused28: ::c_long = 4000 + 28;
pub const SYS_pause: ::c_long = 4000 + 29; pub const SYS_pause: ::c_long = 4000 + 29;
pub const SYS_utime: ::c_long = 4000 + 30; pub const SYS_utime: ::c_long = 4000 + 30;
pub const SYS_stty: ::c_long = 4000 + 31; pub const SYS_stty: ::c_long = 4000 + 31;
@ -288,7 +286,6 @@ pub const SYS_fcntl: ::c_long = 4000 + 55;
pub const SYS_mpx: ::c_long = 4000 + 56; pub const SYS_mpx: ::c_long = 4000 + 56;
pub const SYS_setpgid: ::c_long = 4000 + 57; pub const SYS_setpgid: ::c_long = 4000 + 57;
pub const SYS_ulimit: ::c_long = 4000 + 58; pub const SYS_ulimit: ::c_long = 4000 + 58;
pub const SYS_unused59: ::c_long = 4000 + 59;
pub const SYS_umask: ::c_long = 4000 + 60; pub const SYS_umask: ::c_long = 4000 + 60;
pub const SYS_chroot: ::c_long = 4000 + 61; pub const SYS_chroot: ::c_long = 4000 + 61;
pub const SYS_ustat: ::c_long = 4000 + 62; pub const SYS_ustat: ::c_long = 4000 + 62;
@ -311,9 +308,7 @@ pub const SYS_gettimeofday: ::c_long = 4000 + 78;
pub const SYS_settimeofday: ::c_long = 4000 + 79; pub const SYS_settimeofday: ::c_long = 4000 + 79;
pub const SYS_getgroups: ::c_long = 4000 + 80; pub const SYS_getgroups: ::c_long = 4000 + 80;
pub const SYS_setgroups: ::c_long = 4000 + 81; pub const SYS_setgroups: ::c_long = 4000 + 81;
pub const SYS_reserved82: ::c_long = 4000 + 82;
pub const SYS_symlink: ::c_long = 4000 + 83; pub const SYS_symlink: ::c_long = 4000 + 83;
pub const SYS_unused84: ::c_long = 4000 + 84;
pub const SYS_readlink: ::c_long = 4000 + 85; pub const SYS_readlink: ::c_long = 4000 + 85;
pub const SYS_uselib: ::c_long = 4000 + 86; pub const SYS_uselib: ::c_long = 4000 + 86;
pub const SYS_swapon: ::c_long = 4000 + 87; pub const SYS_swapon: ::c_long = 4000 + 87;
@ -338,7 +333,6 @@ pub const SYS_getitimer: ::c_long = 4000 + 105;
pub const SYS_stat: ::c_long = 4000 + 106; pub const SYS_stat: ::c_long = 4000 + 106;
pub const SYS_lstat: ::c_long = 4000 + 107; pub const SYS_lstat: ::c_long = 4000 + 107;
pub const SYS_fstat: ::c_long = 4000 + 108; pub const SYS_fstat: ::c_long = 4000 + 108;
pub const SYS_unused109: ::c_long = 4000 + 109;
pub const SYS_iopl: ::c_long = 4000 + 110; pub const SYS_iopl: ::c_long = 4000 + 110;
pub const SYS_vhangup: ::c_long = 4000 + 111; pub const SYS_vhangup: ::c_long = 4000 + 111;
pub const SYS_idle: ::c_long = 4000 + 112; pub const SYS_idle: ::c_long = 4000 + 112;
@ -379,7 +373,6 @@ pub const SYS_writev: ::c_long = 4000 + 146;
pub const SYS_cacheflush: ::c_long = 4000 + 147; pub const SYS_cacheflush: ::c_long = 4000 + 147;
pub const SYS_cachectl: ::c_long = 4000 + 148; pub const SYS_cachectl: ::c_long = 4000 + 148;
pub const SYS_sysmips: ::c_long = 4000 + 149; pub const SYS_sysmips: ::c_long = 4000 + 149;
pub const SYS_unused150: ::c_long = 4000 + 150;
pub const SYS_getsid: ::c_long = 4000 + 151; pub const SYS_getsid: ::c_long = 4000 + 151;
pub const SYS_fdatasync: ::c_long = 4000 + 152; pub const SYS_fdatasync: ::c_long = 4000 + 152;
pub const SYS__sysctl: ::c_long = 4000 + 153; pub const SYS__sysctl: ::c_long = 4000 + 153;
@ -450,7 +443,6 @@ pub const SYS_mincore: ::c_long = 4000 + 217;
pub const SYS_madvise: ::c_long = 4000 + 218; pub const SYS_madvise: ::c_long = 4000 + 218;
pub const SYS_getdents64: ::c_long = 4000 + 219; pub const SYS_getdents64: ::c_long = 4000 + 219;
pub const SYS_fcntl64: ::c_long = 4000 + 220; pub const SYS_fcntl64: ::c_long = 4000 + 220;
pub const SYS_reserved221: ::c_long = 4000 + 221;
pub const SYS_gettid: ::c_long = 4000 + 222; pub const SYS_gettid: ::c_long = 4000 + 222;
pub const SYS_readahead: ::c_long = 4000 + 223; pub const SYS_readahead: ::c_long = 4000 + 223;
pub const SYS_setxattr: ::c_long = 4000 + 224; pub const SYS_setxattr: ::c_long = 4000 + 224;

View File

@ -1025,7 +1025,7 @@ extern {
path: *const c_char, path: *const c_char,
) -> c_int; ) -> c_int;
pub fn __wasilibc_fd_renumber(fd: c_int, newfd: c_int) -> c_int; pub fn __wasilibc_fd_renumber(fd: c_int, newfd: c_int) -> c_int;
pub fn __wasilibc_rmfileat(fd: c_int, path: *const c_char) -> c_int; pub fn __wasilibc_unlinkat(fd: c_int, path: *const c_char) -> c_int;
pub fn __wasilibc_rmdirat(fd: c_int, path: *const c_char) -> c_int; pub fn __wasilibc_rmdirat(fd: c_int, path: *const c_char) -> c_int;
pub fn __wasilibc_init_preopen(); pub fn __wasilibc_init_preopen();
pub fn __wasilibc_find_relpath( pub fn __wasilibc_find_relpath(