diff options
-rw-r--r-- | .cirrus.yml | 6 | ||||
-rw-r--r-- | libc-test/semver/android.txt | 1 | ||||
-rw-r--r-- | libc-test/semver/freebsd.txt | 6 | ||||
-rw-r--r-- | libc-test/semver/linux.txt | 1 | ||||
-rw-r--r-- | libc-test/semver/macos-aarch64.txt | 3 | ||||
-rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs | 1 | ||||
-rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/mod.rs | 13 | ||||
-rw-r--r-- | src/unix/linux_like/mod.rs | 1 |
8 files changed, 31 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 36690d7fa9..176a44af8f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,3 +1,7 @@ +env: + # Temporary fix for https://github.com/rust-lang/rustup/issues/2774. + RUSTUP_IO_THREADS: "1" + task: name: stable x86_64-unknown-freebsd-11 freebsd_instance: @@ -31,7 +35,7 @@ task: task: name: nightly x86_64-unknown-freebsd-13 freebsd_instance: - image: freebsd-13-0-alpha3-amd64 + image: freebsd-13-0-release-amd64 setup_script: - pkg install -y curl - curl https://sh.rustup.rs -sSf --output rustup.sh diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt index 7181fb2d09..117d50e361 100644 --- a/libc-test/semver/android.txt +++ b/libc-test/semver/android.txt @@ -1098,6 +1098,7 @@ MS_DIRSYNC MS_INVALIDATE MS_I_VERSION MS_KERNMOUNT +MS_LAZYTIME MS_MANDLOCK MS_MGC_MSK MS_MGC_VAL diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt index 6433821b50..b7735db707 100644 --- a/libc-test/semver/freebsd.txt +++ b/libc-test/semver/freebsd.txt @@ -327,6 +327,10 @@ GLOB_NOMATCH GLOB_NOSORT GLOB_NOSPACE H4DISC +HOSTNAME_FOUND +HOSTNAME_INCORRECTNAME +HOSTNAME_INVALIDADDR +HOSTNAME_INVALIDNAME HW_BYTEORDER HW_DISKNAMES HW_DISKSTATS @@ -1551,6 +1555,8 @@ querylocale rand readdir_r readlinkat +realhostname +realhostname_sa recvmmsg recvmsg regcomp diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index c21d15eecc..128e9d9c1c 100644 --- a/libc-test/semver/linux.txt +++ b/libc-test/semver/linux.txt @@ -1158,6 +1158,7 @@ MS_BIND MS_DIRSYNC MS_I_VERSION MS_KERNMOUNT +MS_LAZYTIME MS_MANDLOCK MS_MGC_MSK MS_MGC_VAL diff --git a/libc-test/semver/macos-aarch64.txt b/libc-test/semver/macos-aarch64.txt new file mode 100644 index 0000000000..1a5fcd2ac3 --- /dev/null +++ b/libc-test/semver/macos-aarch64.txt @@ -0,0 +1,3 @@ +__darwin_arm_exception_state64 +__darwin_arm_neon_state64 +__darwin_arm_thread_state64 diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs index af381c0576..8cb475d9b1 100644 --- a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs @@ -231,6 +231,7 @@ extern "C" { pub fn fdatasync(fd: ::c_int) -> ::c_int; pub fn getrandom(buf: *mut ::c_void, buflen: ::size_t, flags: ::c_uint) -> ::ssize_t; + pub fn getentropy(buf: *mut ::c_void, buflen: ::size_t) -> ::c_int; pub fn elf_aux_info(aux: ::c_int, buf: *mut ::c_void, buflen: ::c_int) -> ::c_int; } diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index 042bec19c5..9a64dc39fd 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -1228,6 +1228,12 @@ pub const F_READAHEAD: ::c_int = 15; pub const F_RDAHEAD: ::c_int = 16; pub const F_DUP2FD_CLOEXEC: ::c_int = 18; +// For realhostname* api +pub const HOSTNAME_FOUND: ::c_int = 0; +pub const HOSTNAME_INCORRECTNAME: ::c_int = 1; +pub const HOSTNAME_INVALIDADDR: ::c_int = 2; +pub const HOSTNAME_INVALIDNAME: ::c_int = 3; + const_fn! { {const} fn _ALIGN(p: usize) -> usize { (p + _ALIGNBYTES) & !_ALIGNBYTES @@ -1612,6 +1618,13 @@ extern "C" { string: *const ::c_char, attrnamespace: *mut ::c_int, ) -> ::c_int; + pub fn realhostname(host: *mut ::c_char, hsize: ::size_t, ip: *const ::in_addr) -> ::c_int; + pub fn realhostname_sa( + host: *mut ::c_char, + hsize: ::size_t, + addr: *mut ::sockaddr, + addrlen: ::c_int, + ) -> ::c_int; } cfg_if! { diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs index bf66fe72b0..4a6d377a3a 100644 --- a/src/unix/linux_like/mod.rs +++ b/src/unix/linux_like/mod.rs @@ -602,6 +602,7 @@ pub const MS_RELATIME: ::c_ulong = 0x200000; pub const MS_KERNMOUNT: ::c_ulong = 0x400000; pub const MS_I_VERSION: ::c_ulong = 0x800000; pub const MS_STRICTATIME: ::c_ulong = 0x1000000; +pub const MS_LAZYTIME: ::c_ulong = 0x2000000; pub const MS_ACTIVE: ::c_ulong = 0x40000000; pub const MS_MGC_VAL: ::c_ulong = 0xc0ed0000; pub const MS_MGC_MSK: ::c_ulong = 0xffff0000; |