Merge branch 'rust' into 'master'

user/rust: Bump to 1.29.1 plus fixes for i586, ppc32



See merge request !85

1 files changed, 642 insertions, 0 deletions

diff --git a/user/rust/0032-libc-dcff154781e4.patch b/user/rust/0032-libc-dcff154781e4.patch
new file mode 100644
index 000000000..6840e203f
--- /dev/null
+++ b/user/rust/0032-libc-dcff154781e4.patch
@@ -0,0 +1,642 @@
+From dcff154781e4b3c6ef3a6a4024c73631f52f48cb Mon Sep 17 00:00:00 2001
+From: Mike Sullivan <mksully22@gmail.com>
+Date: Mon, 18 Jun 2018 15:16:25 +0000
+Subject: [PATCH] libc: changes to ppc64le musl branch to support building of
+ rust on Alpine amend to add style changes amend to add style changes
+
+---
+ src/unix/notbsd/linux/musl/b32/mod.rs       |  74 ++++++++++
+ src/unix/notbsd/linux/musl/b64/mod.rs       |  62 --------
+ src/unix/notbsd/linux/musl/b64/powerpc64.rs | 155 ++++++++++++++++++--
+ src/unix/notbsd/linux/musl/b64/x86_64.rs    | 136 +++++++++++++++++
+ src/unix/notbsd/linux/musl/mod.rs           |  74 ----------
+ 5 files changed, 353 insertions(+), 148 deletions(-)
+
+diff --git a/src/vendor/libc/src/unix/notbsd/linux/musl/b32/mod.rs b/src/vendor/libc/src/unix/notbsd/linux/musl/b32/mod.rs
+index f6e19d981dd..b4a0f761636 100644
+--- a/src/vendor/libc/src/unix/notbsd/linux/musl/b32/mod.rs
++++ b/src/vendor/libc/src/unix/notbsd/linux/musl/b32/mod.rs
+@@ -52,6 +52,80 @@ pub const MINSIGSTKSZ: ::size_t = 2048;
+ pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 32;
+ pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 24;
+ 
++pub const RLIMIT_NLIMITS: ::c_int = 16;
++pub const TIOCINQ: ::c_int = ::FIONREAD;
++pub const MCL_CURRENT: ::c_int = 0x0001;
++pub const MCL_FUTURE: ::c_int = 0x0002;
++pub const CBAUD: ::tcflag_t = 0o0010017;
++pub const TAB1: ::c_int = 0x00000800;
++pub const TAB2: ::c_int = 0x00001000;
++pub const TAB3: ::c_int = 0x00001800;
++pub const CR1: ::c_int  = 0x00000200;
++pub const CR2: ::c_int  = 0x00000400;
++pub const CR3: ::c_int  = 0x00000600;
++pub const FF1: ::c_int  = 0x00008000;
++pub const BS1: ::c_int  = 0x00002000;
++pub const VT1: ::c_int  = 0x00004000;
++pub const VWERASE: usize = 14;
++pub const VREPRINT: usize = 12;
++pub const VSUSP: usize = 10;
++pub const VSTART: usize = 8;
++pub const VSTOP: usize = 9;
++pub const VDISCARD: usize = 13;
++pub const VTIME: usize = 5;
++pub const IXON: ::tcflag_t = 0x00000400;
++pub const IXOFF: ::tcflag_t = 0x00001000;
++pub const ONLCR: ::tcflag_t = 0x4;
++pub const CSIZE: ::tcflag_t = 0x00000030;
++pub const CS6: ::tcflag_t = 0x00000010;
++pub const CS7: ::tcflag_t = 0x00000020;
++pub const CS8: ::tcflag_t = 0x00000030;
++pub const CSTOPB: ::tcflag_t = 0x00000040;
++pub const CREAD: ::tcflag_t = 0x00000080;
++pub const PARENB: ::tcflag_t = 0x00000100;
++pub const PARODD: ::tcflag_t = 0x00000200;
++pub const HUPCL: ::tcflag_t = 0x00000400;
++pub const CLOCAL: ::tcflag_t = 0x00000800;
++pub const ECHOKE: ::tcflag_t = 0x00000800;
++pub const ECHOE: ::tcflag_t = 0x00000010;
++pub const ECHOK: ::tcflag_t = 0x00000020;
++pub const ECHONL: ::tcflag_t = 0x00000040;
++pub const ECHOPRT: ::tcflag_t = 0x00000400;
++pub const ECHOCTL: ::tcflag_t = 0x00000200;
++pub const ISIG: ::tcflag_t = 0x00000001;
++pub const ICANON: ::tcflag_t = 0x00000002;
++pub const PENDIN: ::tcflag_t = 0x00004000;
++pub const NOFLSH: ::tcflag_t = 0x00000080;
++pub const CIBAUD: ::tcflag_t = 0o02003600000;
++pub const CBAUDEX: ::tcflag_t = 0o010000;
++pub const VSWTC: usize = 7;
++pub const OLCUC:  ::tcflag_t = 0o000002;
++pub const NLDLY:  ::tcflag_t = 0o000400;
++pub const CRDLY:  ::tcflag_t = 0o003000;
++pub const TABDLY: ::tcflag_t = 0o014000;
++pub const BSDLY:  ::tcflag_t = 0o020000;
++pub const FFDLY:  ::tcflag_t = 0o100000;
++pub const VTDLY:  ::tcflag_t = 0o040000;
++pub const XTABS:  ::tcflag_t = 0o014000;
++pub const B57600: ::speed_t = 0o010001;
++pub const B115200: ::speed_t = 0o010002;
++pub const B230400: ::speed_t = 0o010003;
++pub const B460800: ::speed_t = 0o010004;
++pub const B500000: ::speed_t = 0o010005;
++pub const B576000: ::speed_t = 0o010006;
++pub const B921600: ::speed_t = 0o010007;
++pub const B1000000: ::speed_t = 0o010010;
++pub const B1152000: ::speed_t = 0o010011;
++pub const B1500000: ::speed_t = 0o010012;
++pub const B2000000: ::speed_t = 0o010013;
++pub const B2500000: ::speed_t = 0o010014;
++pub const B3000000: ::speed_t = 0o010015;
++pub const B3500000: ::speed_t = 0o010016;
++pub const B4000000: ::speed_t = 0o010017;
++extern {
++    pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
++}
++
+ cfg_if! {
+     if #[cfg(any(target_arch = "x86"))] {
+         mod x86;
+diff --git a/src/vendor/libc/src/unix/notbsd/linux/musl/b64/mod.rs b/src/vendor/libc/src/unix/notbsd/linux/musl/b64/mod.rs
+index 70baf8277a9..5c2e815fd60 100644
+--- a/src/vendor/libc/src/unix/notbsd/linux/musl/b64/mod.rs
++++ b/src/vendor/libc/src/unix/notbsd/linux/musl/b64/mod.rs
+@@ -136,9 +136,6 @@ pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
+ 
+ pub const O_ASYNC: ::c_int = 0x2000;
+ 
+-pub const FIOCLEX: ::c_int = 0x5451;
+-pub const FIONBIO: ::c_int = 0x5421;
+-
+ pub const RLIMIT_RSS: ::c_int = 5;
+ pub const RLIMIT_NOFILE: ::c_int = 7;
+ pub const RLIMIT_AS: ::c_int = 9;
+@@ -172,7 +169,6 @@ pub const SOCK_SEQPACKET: ::c_int = 5;
+ 
+ pub const SOL_SOCKET: ::c_int = 1;
+ 
+-pub const EDEADLK: ::c_int = 35;
+ pub const ENAMETOOLONG: ::c_int = 36;
+ pub const ENOLCK: ::c_int = 37;
+ pub const ENOSYS: ::c_int = 38;
+@@ -194,7 +190,6 @@ pub const EXFULL: ::c_int = 54;
+ pub const ENOANO: ::c_int = 55;
+ pub const EBADRQC: ::c_int = 56;
+ pub const EBADSLT: ::c_int = 57;
+-pub const EDEADLOCK: ::c_int = EDEADLK;
+ pub const EMULTIHOP: ::c_int = 72;
+ pub const EBADMSG: ::c_int = 74;
+ pub const EOVERFLOW: ::c_int = 75;
+@@ -272,12 +267,6 @@ pub const SO_PRIORITY: ::c_int = 12;
+ pub const SO_LINGER: ::c_int = 13;
+ pub const SO_BSDCOMPAT: ::c_int = 14;
+ pub const SO_REUSEPORT: ::c_int = 15;
+-pub const SO_PASSCRED: ::c_int = 16;
+-pub const SO_PEERCRED: ::c_int = 17;
+-pub const SO_RCVLOWAT: ::c_int = 18;
+-pub const SO_SNDLOWAT: ::c_int = 19;
+-pub const SO_RCVTIMEO: ::c_int = 20;
+-pub const SO_SNDTIMEO: ::c_int = 21;
+ pub const SO_ACCEPTCONN: ::c_int = 30;
+ pub const SO_SNDBUFFORCE: ::c_int = 32;
+ pub const SO_RCVBUFFORCE: ::c_int = 33;
+@@ -312,8 +301,6 @@ pub const SIG_SETMASK: ::c_int = 2;
+ pub const SIG_BLOCK: ::c_int = 0x000000;
+ pub const SIG_UNBLOCK: ::c_int = 0x01;
+ 
+-pub const EXTPROC: ::tcflag_t = 0x00010000;
+-
+ pub const MAP_HUGETLB: ::c_int = 0x040000;
+ 
+ pub const F_GETLK: ::c_int = 5;
+@@ -323,59 +310,10 @@ pub const F_SETLKW: ::c_int = 7;
+ pub const F_SETOWN: ::c_int = 8;
+ 
+ pub const VEOF: usize = 4;
+-pub const VEOL: usize = 11;
+-pub const VEOL2: usize = 16;
+-pub const VMIN: usize = 6;
+-pub const IEXTEN: ::tcflag_t = 0x00008000;
+-pub const TOSTOP: ::tcflag_t = 0x00000100;
+-pub const FLUSHO: ::tcflag_t = 0x00001000;
+-
+-pub const TCGETS: ::c_int = 0x5401;
+-pub const TCSETS: ::c_int = 0x5402;
+-pub const TCSETSW: ::c_int = 0x5403;
+-pub const TCSETSF: ::c_int = 0x5404;
+-pub const TCGETA: ::c_int = 0x5405;
+-pub const TCSETA: ::c_int = 0x5406;
+-pub const TCSETAW: ::c_int = 0x5407;
+-pub const TCSETAF: ::c_int = 0x5408;
+-pub const TCSBRK: ::c_int = 0x5409;
+-pub const TCXONC: ::c_int = 0x540A;
+-pub const TCFLSH: ::c_int = 0x540B;
+-pub const TIOCGSOFTCAR: ::c_int = 0x5419;
+-pub const TIOCSSOFTCAR: ::c_int = 0x541A;
+-pub const TIOCLINUX: ::c_int = 0x541C;
+-pub const TIOCGSERIAL: ::c_int = 0x541E;
+-pub const TIOCEXCL: ::c_int = 0x540C;
+-pub const TIOCNXCL: ::c_int = 0x540D;
+-pub const TIOCSCTTY: ::c_int = 0x540E;
+-pub const TIOCGPGRP: ::c_int = 0x540F;
+-pub const TIOCSPGRP: ::c_int = 0x5410;
+-pub const TIOCOUTQ: ::c_int = 0x5411;
+-pub const TIOCSTI: ::c_int = 0x5412;
+-pub const TIOCGWINSZ: ::c_int = 0x5413;
+-pub const TIOCSWINSZ: ::c_int = 0x5414;
+-pub const TIOCMGET: ::c_int = 0x5415;
+-pub const TIOCMBIS: ::c_int = 0x5416;
+-pub const TIOCMBIC: ::c_int = 0x5417;
+-pub const TIOCMSET: ::c_int = 0x5418;
+-pub const FIONREAD: ::c_int = 0x541B;
+-pub const TIOCCONS: ::c_int = 0x541D;
+ 
+ pub const POLLWRNORM: ::c_short = 0x100;
+ pub const POLLWRBAND: ::c_short = 0x200;
+ 
+-pub const TIOCM_LE: ::c_int = 0x001;
+-pub const TIOCM_DTR: ::c_int = 0x002;
+-pub const TIOCM_RTS: ::c_int = 0x004;
+-pub const TIOCM_ST: ::c_int = 0x008;
+-pub const TIOCM_SR: ::c_int = 0x010;
+-pub const TIOCM_CTS: ::c_int = 0x020;
+-pub const TIOCM_CAR: ::c_int = 0x040;
+-pub const TIOCM_RNG: ::c_int = 0x080;
+-pub const TIOCM_DSR: ::c_int = 0x100;
+-pub const TIOCM_CD: ::c_int = TIOCM_CAR;
+-pub const TIOCM_RI: ::c_int = TIOCM_RNG;
+-
+ cfg_if! {
+     if #[cfg(target_arch = "aarch64")] {
+         mod aarch64;
+diff --git a/src/vendor/libc/src/unix/notbsd/linux/musl/b64/powerpc64.rs b/src/vendor/libc/src/unix/notbsd/linux/musl/b64/powerpc64.rs
+index 621f9f4ce79..2ac39bf0cd5 100644
+--- a/src/vendor/libc/src/unix/notbsd/linux/musl/b64/powerpc64.rs
++++ b/src/vendor/libc/src/unix/notbsd/linux/musl/b64/powerpc64.rs
+@@ -60,22 +60,17 @@ s! {
+     }
+ }
+ 
+-pub const SYS_pivot_root: ::c_long = 203;
+-pub const SYS_gettid: ::c_long = 207;
+-pub const SYS_perf_event_open: ::c_long = 319;
+-pub const SYS_memfd_create: ::c_long = 360;
+-
+ pub const MAP_32BIT: ::c_int = 0x0040;
+-pub const O_DIRECT: ::c_int = 0x4000;
+-pub const O_DIRECTORY: ::c_int = 0x10000;
+-pub const O_LARGEFILE: ::c_int = 0;
+-pub const O_NOFOLLOW: ::c_int = 0x20000;
++pub const O_DIRECT: ::c_int = 0x20000;
++pub const O_DIRECTORY: ::c_int = 0x4000;
++pub const O_LARGEFILE: ::c_int = 0x10000;
++pub const O_NOFOLLOW: ::c_int = 0x8000;
+ 
+-pub const SIGSTKSZ: ::size_t = 8192;
+-pub const MINSIGSTKSZ: ::size_t = 2048;
++pub const SIGSTKSZ: ::size_t = 10240;
++pub const MINSIGSTKSZ: ::size_t = 4096;
+ 
+ #[doc(hidden)]
+-pub const AF_MAX: ::c_int = 42;
++pub const AF_MAX: ::c_int = 43;
+ #[doc(hidden)]
+ pub const PF_MAX: ::c_int = AF_MAX;
+ 
+@@ -439,3 +434,139 @@ pub const SYS_copy_file_range: ::c_long = 379;
+ pub const SYS_preadv2: ::c_long = 380;
+ pub const SYS_pwritev2: ::c_long = 381;
+ pub const SYS_kexec_file_load: ::c_long = 382;
++
++pub const FIOCLEX: ::c_ulong = 0x20006601;
++pub const FIONBIO: ::c_ulong = 0x8004667e;
++pub const EDEADLK: ::c_int = 58;
++pub const EDEADLOCK: ::c_int = EDEADLK;
++pub const SO_PASSCRED: ::c_int = 20;
++pub const SO_PEERCRED: ::c_int = 21;
++pub const SO_RCVLOWAT: ::c_int = 16;
++pub const SO_SNDLOWAT: ::c_int = 17;
++pub const SO_RCVTIMEO: ::c_int = 18;
++pub const SO_SNDTIMEO: ::c_int = 19;
++pub const EXTPROC: ::tcflag_t = 0x10000000;
++pub const VEOL: usize = 6;
++pub const VEOL2: usize = 8;
++pub const VMIN: usize = 5;
++pub const IEXTEN: ::tcflag_t = 0x00000400;
++pub const TOSTOP: ::tcflag_t = 0x00400000;
++pub const FLUSHO: ::tcflag_t = 0x00800000;
++pub const TCGETS: ::c_ulong = 0x403c7413;
++pub const TCSETS: ::c_ulong = 0x803c7414;
++pub const TCSETSW: ::c_ulong = 0x803c7415;
++pub const TCSETSF: ::c_ulong = 0x803c7416;
++pub const TCGETA: ::c_ulong = 0x40147417;
++pub const TCSETA: ::c_ulong = 0x80147418;
++pub const TCSETAW: ::c_ulong = 0x80147419;
++pub const TCSETAF: ::c_ulong = 0x8014741c;
++pub const TCSBRK: ::c_ulong = 0x2000741d;
++pub const TCXONC: ::c_ulong = 0x2000741e;
++pub const TCFLSH: ::c_ulong = 0x2000741f;
++pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
++pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
++pub const TIOCLINUX: ::c_ulong = 0x541C;
++pub const TIOCGSERIAL: ::c_ulong = 0x541E;
++pub const TIOCEXCL: ::c_ulong = 0x540C;
++pub const TIOCNXCL: ::c_ulong = 0x540D;
++pub const TIOCSCTTY: ::c_ulong = 0x540E;
++pub const TIOCGPGRP: ::c_ulong = 0x40047477;
++pub const TIOCSPGRP: ::c_ulong = 0x80047476;
++pub const TIOCOUTQ: ::c_ulong = 0x40047473;
++pub const TIOCGWINSZ: ::c_ulong = 0x40087468;
++pub const TIOCSWINSZ: ::c_ulong = 0x80087467;
++pub const TIOCMGET: ::c_ulong = 0x5415;
++pub const TIOCMBIS: ::c_ulong = 0x5416;
++pub const TIOCMBIC: ::c_ulong = 0x5417;
++pub const TIOCMSET: ::c_ulong = 0x5418;
++pub const FIONREAD: ::c_ulong = 0x4004667f;
++pub const TIOCCONS: ::c_ulong = 0x541D;
++pub const TIOCM_LE: ::c_ulong = 0x001;
++pub const TIOCM_DTR: ::c_ulong = 0x002;
++pub const TIOCM_RTS: ::c_ulong = 0x004;
++pub const TIOCM_ST: ::c_ulong = 0x008;
++pub const TIOCM_SR: ::c_ulong = 0x010;
++pub const TIOCM_CTS: ::c_ulong = 0x020;
++pub const TIOCM_CAR: ::c_ulong = 0x040;
++pub const TIOCM_RNG: ::c_ulong = 0x080;
++pub const TIOCM_DSR: ::c_ulong = 0x100;
++pub const TIOCM_CD: ::c_ulong = TIOCM_CAR;
++pub const TIOCM_RI: ::c_ulong = TIOCM_RNG;
++
++pub const RLIMIT_NLIMITS: ::c_int = 15;
++pub const TIOCINQ: ::c_ulong = ::FIONREAD;
++pub const MCL_CURRENT: ::c_int = 0x2000;
++pub const MCL_FUTURE: ::c_int = 0x4000;
++pub const CBAUD: ::tcflag_t = 0xff;
++pub const TAB1: ::c_int = 0x400;
++pub const TAB2: ::c_int = 0x800;
++pub const TAB3: ::c_int = 0xc00;
++pub const CR1: ::c_int  = 0x1000;
++pub const CR2: ::c_int  = 0x2000;
++pub const CR3: ::c_int  = 0x3000;
++pub const FF1: ::c_int  = 0x4000;
++pub const BS1: ::c_int  = 0x8000;
++pub const VT1: ::c_int  = 0x10000;
++pub const VWERASE: usize = 10;
++pub const VREPRINT: usize = 11;
++pub const VSUSP: usize = 12;
++pub const VSTART: usize = 13;
++pub const VSTOP: usize = 14;
++pub const VDISCARD: usize = 16;
++pub const VTIME: usize = 7;
++pub const IXON: ::tcflag_t = 0x00000200;
++pub const IXOFF: ::tcflag_t = 0x00000400;
++pub const ONLCR: ::tcflag_t = 0x2;
++pub const CSIZE: ::tcflag_t = 0x00000300;
++
++pub const CS6: ::tcflag_t = 0x00000100;
++pub const CS7: ::tcflag_t = 0x00000200;
++pub const CS8: ::tcflag_t = 0x00000300;
++pub const CSTOPB: ::tcflag_t = 0x00000400;
++pub const CREAD: ::tcflag_t = 0x00000800;
++pub const PARENB: ::tcflag_t = 0x00001000;
++pub const PARODD: ::tcflag_t = 0x00002000;
++pub const HUPCL: ::tcflag_t = 0x00004000;
++pub const CLOCAL: ::tcflag_t = 0x00008000;
++pub const ECHOKE: ::tcflag_t = 0x00000001;
++pub const ECHOE: ::tcflag_t = 0x00000002;
++pub const ECHOK: ::tcflag_t = 0x00000004;
++pub const ECHONL: ::tcflag_t = 0x00000010;
++pub const ECHOPRT: ::tcflag_t = 0x00000020;
++pub const ECHOCTL: ::tcflag_t = 0x00000040;
++pub const ISIG: ::tcflag_t = 0x00000080;
++pub const ICANON: ::tcflag_t = 0x00000100;
++pub const PENDIN: ::tcflag_t = 0x20000000;
++pub const NOFLSH: ::tcflag_t = 0x80000000;
++
++pub const CIBAUD: ::tcflag_t = 0o77600000;
++pub const CBAUDEX: ::tcflag_t = 0o0000020;
++pub const VSWTC: usize = 9;
++pub const OLCUC:  ::tcflag_t = 0o000004;
++pub const NLDLY:  ::tcflag_t = 0o0001400;
++pub const CRDLY:  ::tcflag_t = 0o0030000;
++pub const TABDLY: ::tcflag_t = 0o0006000;
++pub const BSDLY:  ::tcflag_t = 0o0100000;
++pub const FFDLY:  ::tcflag_t = 0o0040000;
++pub const VTDLY:  ::tcflag_t = 0o0200000;
++pub const XTABS:  ::tcflag_t = 0o00006000;
++
++pub const B57600: ::speed_t = 0o00020;
++pub const B115200: ::speed_t = 0o00021;
++pub const B230400: ::speed_t = 0o00022;
++pub const B460800: ::speed_t = 0o00023;
++pub const B500000: ::speed_t = 0o00024;
++pub const B576000: ::speed_t = 0o00025;
++pub const B921600: ::speed_t = 0o00026;
++pub const B1000000: ::speed_t = 0o00027;
++pub const B1152000: ::speed_t = 0o00030;
++pub const B1500000: ::speed_t = 0o00031;
++pub const B2000000: ::speed_t = 0o00032;
++pub const B2500000: ::speed_t = 0o00033;
++pub const B3000000: ::speed_t = 0o00034;
++pub const B3500000: ::speed_t = 0o00035;
++pub const B4000000: ::speed_t = 0o00036;
++
++extern {
++    pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
++}
+diff --git a/src/vendor/libc/src/unix/notbsd/linux/musl/b64/x86_64.rs b/src/vendor/libc/src/unix/notbsd/linux/musl/b64/x86_64.rs
+index 78d38e49e8f..0e0fcec4d2e 100644
+--- a/src/vendor/libc/src/unix/notbsd/linux/musl/b64/x86_64.rs
++++ b/src/vendor/libc/src/unix/notbsd/linux/musl/b64/x86_64.rs
+@@ -449,3 +449,139 @@ pub const MINSIGSTKSZ: ::size_t = 2048;
+ pub const AF_MAX: ::c_int = 42;
+ #[doc(hidden)]
+ pub const PF_MAX: ::c_int = AF_MAX;
++
++pub const RLIMIT_NLIMITS: ::c_int = 16;
++pub const TIOCINQ: ::c_int = ::FIONREAD;
++pub const MCL_CURRENT: ::c_int = 0x0001;
++pub const MCL_FUTURE: ::c_int = 0x0002;
++pub const CBAUD: ::tcflag_t = 0o0010017;
++pub const TAB1: ::c_int = 0x00000800;
++pub const TAB2: ::c_int = 0x00001000;
++pub const TAB3: ::c_int = 0x00001800;
++pub const CR1: ::c_int  = 0x00000200;
++pub const CR2: ::c_int  = 0x00000400;
++pub const CR3: ::c_int  = 0x00000600;
++pub const FF1: ::c_int  = 0x00008000;
++pub const BS1: ::c_int  = 0x00002000;
++pub const VT1: ::c_int  = 0x00004000;
++pub const VWERASE: usize = 14;
++pub const VREPRINT: usize = 12;
++pub const VSUSP: usize = 10;
++pub const VSTART: usize = 8;
++pub const VSTOP: usize = 9;
++pub const VDISCARD: usize = 13;
++pub const VTIME: usize = 5;
++pub const IXON: ::tcflag_t = 0x00000400;
++pub const IXOFF: ::tcflag_t = 0x00001000;
++pub const ONLCR: ::tcflag_t = 0x4;
++pub const CSIZE: ::tcflag_t = 0x00000030;
++pub const CS6: ::tcflag_t = 0x00000010;
++pub const CS7: ::tcflag_t = 0x00000020;
++pub const CS8: ::tcflag_t = 0x00000030;
++pub const CSTOPB: ::tcflag_t = 0x00000040;
++pub const CREAD: ::tcflag_t = 0x00000080;
++pub const PARENB: ::tcflag_t = 0x00000100;
++pub const PARODD: ::tcflag_t = 0x00000200;
++pub const HUPCL: ::tcflag_t = 0x00000400;
++pub const CLOCAL: ::tcflag_t = 0x00000800;
++pub const ECHOKE: ::tcflag_t = 0x00000800;
++pub const ECHOE: ::tcflag_t = 0x00000010;
++pub const ECHOK: ::tcflag_t = 0x00000020;
++pub const ECHONL: ::tcflag_t = 0x00000040;
++pub const ECHOPRT: ::tcflag_t = 0x00000400;
++pub const ECHOCTL: ::tcflag_t = 0x00000200;
++pub const ISIG: ::tcflag_t = 0x00000001;
++pub const ICANON: ::tcflag_t = 0x00000002;
++pub const PENDIN: ::tcflag_t = 0x00004000;
++pub const NOFLSH: ::tcflag_t = 0x00000080;
++pub const CIBAUD: ::tcflag_t = 0o02003600000;
++pub const CBAUDEX: ::tcflag_t = 0o010000;
++pub const VSWTC: usize = 7;
++pub const OLCUC:  ::tcflag_t = 0o000002;
++pub const NLDLY:  ::tcflag_t = 0o000400;
++pub const CRDLY:  ::tcflag_t = 0o003000;
++pub const TABDLY: ::tcflag_t = 0o014000;
++pub const BSDLY:  ::tcflag_t = 0o020000;
++pub const FFDLY:  ::tcflag_t = 0o100000;
++pub const VTDLY:  ::tcflag_t = 0o040000;
++pub const XTABS:  ::tcflag_t = 0o014000;
++pub const B57600: ::speed_t = 0o010001;
++pub const B115200: ::speed_t = 0o010002;
++pub const B230400: ::speed_t = 0o010003;
++pub const B460800: ::speed_t = 0o010004;
++pub const B500000: ::speed_t = 0o010005;
++pub const B576000: ::speed_t = 0o010006;
++pub const B921600: ::speed_t = 0o010007;
++pub const B1000000: ::speed_t = 0o010010;
++pub const B1152000: ::speed_t = 0o010011;
++pub const B1500000: ::speed_t = 0o010012;
++pub const B2000000: ::speed_t = 0o010013;
++pub const B2500000: ::speed_t = 0o010014;
++pub const B3000000: ::speed_t = 0o010015;
++pub const B3500000: ::speed_t = 0o010016;
++pub const B4000000: ::speed_t = 0o010017;
++
++pub const FIOCLEX: ::c_int = 0x5451;
++pub const FIONBIO: ::c_int = 0x5421;
++pub const EDEADLK: ::c_int = 35;
++pub const EDEADLOCK: ::c_int = EDEADLK;
++pub const SO_PASSCRED: ::c_int = 16;
++pub const SO_PEERCRED: ::c_int = 17;
++pub const SO_RCVLOWAT: ::c_int = 18;
++pub const SO_SNDLOWAT: ::c_int = 19;
++pub const SO_RCVTIMEO: ::c_int = 20;
++pub const SO_SNDTIMEO: ::c_int = 21;
++pub const EXTPROC: ::tcflag_t = 0x00010000;
++pub const VEOL: usize = 11;
++pub const VEOL2: usize = 16;
++pub const VMIN: usize = 6;
++pub const IEXTEN: ::tcflag_t = 0x00008000;
++pub const TOSTOP: ::tcflag_t = 0x00000100;
++pub const FLUSHO: ::tcflag_t = 0x00001000;
++pub const TCGETS: ::c_int = 0x5401;
++pub const TCSETS: ::c_int = 0x5402;
++pub const TCSETSW: ::c_int = 0x5403;
++pub const TCSETSF: ::c_int = 0x5404;
++pub const TCGETA: ::c_int = 0x5405;
++pub const TCSETA: ::c_int = 0x5406;
++pub const TCSETAW: ::c_int = 0x5407;
++pub const TCSETAF: ::c_int = 0x5408;
++pub const TCSBRK: ::c_int = 0x5409;
++pub const TCXONC: ::c_int = 0x540A;
++pub const TCFLSH: ::c_int = 0x540B;
++pub const TIOCGSOFTCAR: ::c_int = 0x5419;
++pub const TIOCSSOFTCAR: ::c_int = 0x541A;
++pub const TIOCLINUX: ::c_int = 0x541C;
++pub const TIOCGSERIAL: ::c_int = 0x541E;
++pub const TIOCEXCL: ::c_int = 0x540C;
++pub const TIOCNXCL: ::c_int = 0x540D;
++pub const TIOCSCTTY: ::c_int = 0x540E;
++pub const TIOCGPGRP: ::c_int = 0x540F;
++pub const TIOCSPGRP: ::c_int = 0x5410;
++pub const TIOCOUTQ: ::c_int = 0x5411;
++pub const TIOCSTI: ::c_int = 0x5412;
++pub const TIOCGWINSZ: ::c_int = 0x5413;
++pub const TIOCSWINSZ: ::c_int = 0x5414;
++pub const TIOCMGET: ::c_int = 0x5415;
++pub const TIOCMBIS: ::c_int = 0x5416;
++pub const TIOCMBIC: ::c_int = 0x5417;
++pub const TIOCMSET: ::c_int = 0x5418;
++pub const FIONREAD: ::c_int = 0x541B;
++pub const TIOCCONS: ::c_int = 0x541D;
++
++pub const TIOCM_LE: ::c_int = 0x001;
++pub const TIOCM_DTR: ::c_int = 0x002;
++pub const TIOCM_RTS: ::c_int = 0x004;
++pub const TIOCM_ST: ::c_int = 0x008;
++pub const TIOCM_SR: ::c_int = 0x010;
++pub const TIOCM_CTS: ::c_int = 0x020;
++pub const TIOCM_CAR: ::c_int = 0x040;
++pub const TIOCM_RNG: ::c_int = 0x080;
++pub const TIOCM_DSR: ::c_int = 0x100;
++pub const TIOCM_CD: ::c_int = TIOCM_CAR;
++pub const TIOCM_RI: ::c_int = TIOCM_RNG;
++
++extern {
++    pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
++}
++
+diff --git a/src/vendor/libc/src/unix/notbsd/linux/musl/mod.rs b/src/vendor/libc/src/unix/notbsd/linux/musl/mod.rs
+index 9a63d1f7330..0d92a4b9d14 100644
+--- a/src/vendor/libc/src/unix/notbsd/linux/musl/mod.rs
++++ b/src/vendor/libc/src/unix/notbsd/linux/musl/mod.rs
+@@ -147,7 +147,6 @@ pub const POSIX_MADV_DONTNEED: ::c_int = 4;
+ 
+ pub const RLIM_INFINITY: ::rlim_t = !0;
+ pub const RLIMIT_RTTIME: ::c_int = 15;
+-pub const RLIMIT_NLIMITS: ::c_int = 16;
+ 
+ pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
+ 
+@@ -213,8 +212,6 @@ pub const TCSANOW: ::c_int = 0;
+ pub const TCSADRAIN: ::c_int = 1;
+ pub const TCSAFLUSH: ::c_int = 2;
+ 
+-pub const TIOCINQ: ::c_int = ::FIONREAD;
+-
+ pub const RTLD_GLOBAL: ::c_int = 0x100;
+ pub const RTLD_NOLOAD: ::c_int = 0x4;
+ 
+@@ -223,61 +220,6 @@ pub const RTLD_NOLOAD: ::c_int = 0x4;
+ pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
+ pub const CLOCK_TAI: ::clockid_t = 11;
+ 
+-pub const MCL_CURRENT: ::c_int = 0x0001;
+-pub const MCL_FUTURE: ::c_int = 0x0002;
+-
+-pub const CBAUD: ::tcflag_t = 0o0010017;
+-pub const TAB1: ::c_int = 0x00000800;
+-pub const TAB2: ::c_int = 0x00001000;
+-pub const TAB3: ::c_int = 0x00001800;
+-pub const CR1: ::c_int  = 0x00000200;
+-pub const CR2: ::c_int  = 0x00000400;
+-pub const CR3: ::c_int  = 0x00000600;
+-pub const FF1: ::c_int  = 0x00008000;
+-pub const BS1: ::c_int  = 0x00002000;
+-pub const VT1: ::c_int  = 0x00004000;
+-pub const VWERASE: usize = 14;
+-pub const VREPRINT: usize = 12;
+-pub const VSUSP: usize = 10;
+-pub const VSTART: usize = 8;
+-pub const VSTOP: usize = 9;
+-pub const VDISCARD: usize = 13;
+-pub const VTIME: usize = 5;
+-pub const IXON: ::tcflag_t = 0x00000400;
+-pub const IXOFF: ::tcflag_t = 0x00001000;
+-pub const ONLCR: ::tcflag_t = 0x4;
+-pub const CSIZE: ::tcflag_t = 0x00000030;
+-pub const CS6: ::tcflag_t = 0x00000010;
+-pub const CS7: ::tcflag_t = 0x00000020;
+-pub const CS8: ::tcflag_t = 0x00000030;
+-pub const CSTOPB: ::tcflag_t = 0x00000040;
+-pub const CREAD: ::tcflag_t = 0x00000080;
+-pub const PARENB: ::tcflag_t = 0x00000100;
+-pub const PARODD: ::tcflag_t = 0x00000200;
+-pub const HUPCL: ::tcflag_t = 0x00000400;
+-pub const CLOCAL: ::tcflag_t = 0x00000800;
+-pub const ECHOKE: ::tcflag_t = 0x00000800;
+-pub const ECHOE: ::tcflag_t = 0x00000010;
+-pub const ECHOK: ::tcflag_t = 0x00000020;
+-pub const ECHONL: ::tcflag_t = 0x00000040;
+-pub const ECHOPRT: ::tcflag_t = 0x00000400;
+-pub const ECHOCTL: ::tcflag_t = 0x00000200;
+-pub const ISIG: ::tcflag_t = 0x00000001;
+-pub const ICANON: ::tcflag_t = 0x00000002;
+-pub const PENDIN: ::tcflag_t = 0x00004000;
+-pub const NOFLSH: ::tcflag_t = 0x00000080;
+-pub const CIBAUD: ::tcflag_t = 0o02003600000;
+-pub const CBAUDEX: ::tcflag_t = 0o010000;
+-pub const VSWTC: usize = 7;
+-pub const OLCUC:  ::tcflag_t = 0o000002;
+-pub const NLDLY:  ::tcflag_t = 0o000400;
+-pub const CRDLY:  ::tcflag_t = 0o003000;
+-pub const TABDLY: ::tcflag_t = 0o014000;
+-pub const BSDLY:  ::tcflag_t = 0o020000;
+-pub const FFDLY:  ::tcflag_t = 0o100000;
+-pub const VTDLY:  ::tcflag_t = 0o040000;
+-pub const XTABS:  ::tcflag_t = 0o014000;
+-
+ pub const B0: ::speed_t = 0o000000;
+ pub const B50: ::speed_t = 0o000001;
+ pub const B75: ::speed_t = 0o000002;
+@@ -296,21 +238,6 @@ pub const B19200: ::speed_t = 0o000016;
+ pub const B38400: ::speed_t = 0o000017;
+ pub const EXTA: ::speed_t = B19200;
+ pub const EXTB: ::speed_t = B38400;
+-pub const B57600: ::speed_t = 0o010001;
+-pub const B115200: ::speed_t = 0o010002;
+-pub const B230400: ::speed_t = 0o010003;
+-pub const B460800: ::speed_t = 0o010004;
+-pub const B500000: ::speed_t = 0o010005;
+-pub const B576000: ::speed_t = 0o010006;
+-pub const B921600: ::speed_t = 0o010007;
+-pub const B1000000: ::speed_t = 0o010010;
+-pub const B1152000: ::speed_t = 0o010011;
+-pub const B1500000: ::speed_t = 0o010012;
+-pub const B2000000: ::speed_t = 0o010013;
+-pub const B2500000: ::speed_t = 0o010014;
+-pub const B3000000: ::speed_t = 0o010015;
+-pub const B3500000: ::speed_t = 0o010016;
+-pub const B4000000: ::speed_t = 0o010017;
+ 
+ pub const SO_BINDTODEVICE: ::c_int = 25;
+ pub const SO_TIMESTAMP: ::c_int = 29;
+@@ -320,7 +247,6 @@ pub const SO_PEEK_OFF: ::c_int = 42;
+ pub const SO_BUSY_POLL: ::c_int = 46;
+ 
+ extern {
+-    pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
+     pub fn ptrace(request: ::c_int, ...) -> ::c_long;
+     pub fn getpriority(which: ::c_int, who: ::id_t) -> ::c_int;
+     pub fn setpriority(which: ::c_int, who: ::id_t, prio: ::c_int) -> ::c_int;