Merge #71

71: Automated pull from `rust-lang/libc` r=tshepang a=github-actions[bot] This PR pulls the following changes from the [`rust-lang/libc`](https://github.com/rust-lang/libc) repository: * rust-lang/libc#3410 * rust-lang/libc#3302 * rust-lang/libc#3409 * rust-lang/libc#3398 * rust-lang/libc#3324 * rust-lang/libc#3394 * rust-lang/libc#3391 * rust-lang/libc#3399 * rust-lang/libc#3404 * rust-lang/libc#3411 * rust-lang/libc#3291 * rust-lang/libc#3412 Co-authored-by: Qiu Chaofan <qcf@ecnelises.com> Co-authored-by: Havard Eidnes <he@NetBSD.org> Co-authored-by: David Carlier <devnexen@gmail.com> Co-authored-by: Marvin Schmidt <marv@exherbo.org> Co-authored-by: Khem Raj <raj.khem@gmail.com> Co-authored-by: Laurence Tratt <laurie@tratt.net> Co-authored-by: Urgau <urgau@numericable.fr> Co-authored-by: bors <bors@rust-lang.org> Co-authored-by: Yuki Okushi <jtitor@2k36.org>
ferrocene · Oct 31, 2023 · 5cf304d · 5cf304d
2 parents 4e9576e + 6a3a680
commit 5cf304d
Show file tree

Hide file tree

Showing 34 changed files with 162 additions and 76 deletions.
diff --git a/ferrocene/library/libc/.github/dependabot.yml b/ferrocene/library/libc/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/ferrocene/library/libc/.github/workflows/bors.yml b/ferrocene/library/libc/.github/workflows/bors.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run-docker.sh
@@ -49,7 +49,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run.sh
@@ -84,7 +84,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Self-update rustup
         run: rustup self update
         shell: bash
@@ -106,7 +106,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: sh ./ci/install-rust.sh
       - name: Check style
@@ -167,7 +167,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run-docker.sh
@@ -195,7 +195,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TOOLCHAIN=nightly INSTALL_RUST_SRC=1 sh ./ci/install-rust.sh
       - name: Execute run-docker.sh
@@ -214,7 +214,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: sh ./ci/install-rust.sh
       - name: Execute run-docker.sh
@@ -250,7 +250,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
       - name: Execute build.sh
@@ -285,7 +285,7 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TOOLCHAIN=${{ matrix.target.toolchain }} sh ./ci/install-rust.sh
       - name: Execute build.sh
@@ -310,7 +310,7 @@ jobs:
           stable,
         ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Self-update rustup
         run: rustup self update
         shell: bash
@@ -329,11 +329,11 @@ jobs:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
         with:
           github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TOOLCHAIN=nightly sh ./ci/install-rust.sh
       - name: Build with check-cfg
-        run: LIBC_CI=1 LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg=features,names,values,output
+        run: LIBC_CI=1 LIBC_CHECK_CFG=1 cargo build -Z unstable-options -Z check-cfg
 
   # These jobs doesn't actually test anything, but they're only used to tell
   # bors the build completed, as there is no practical way to detect when a

diff --git a/ferrocene/library/libc/.github/workflows/main.yml b/ferrocene/library/libc/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
           x86_64-unknown-linux-gnu,
         ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run-docker.sh
@@ -38,7 +38,7 @@ jobs:
           x86_64-apple-darwin,
         ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
       - name: Execute run.sh
@@ -66,7 +66,7 @@ jobs:
           #    ARCH: i686
           - target: i686-pc-windows-msvc
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Self-update rustup
         run: rustup self update
         shell: bash
@@ -81,7 +81,7 @@ jobs:
     name: Style check
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         run: sh ./ci/install-rust.sh
       - name: Check style

diff --git a/ferrocene/library/libc/build.rs b/ferrocene/library/libc/build.rs
@@ -167,11 +167,19 @@ fn main() {
     // https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#check-cfg
     if libc_check_cfg {
         for cfg in ALLOWED_CFGS {
-            println!("cargo:rustc-check-cfg=values({})", cfg);
+            if rustc_minor_ver >= 75 {
+                println!("cargo:rustc-check-cfg=cfg({})", cfg);
+            } else {
+                println!("cargo:rustc-check-cfg=values({})", cfg);
+            }
         }
         for &(name, values) in CHECK_CFG_EXTRA {
             let values = values.join("\",\"");
-            println!("cargo:rustc-check-cfg=values({},\"{}\")", name, values);
+            if rustc_minor_ver >= 75 {
+                println!("cargo:rustc-check-cfg=cfg({},values(\"{}\"))", name, values);
+            } else {
+                println!("cargo:rustc-check-cfg=values({},\"{}\")", name, values);
+            }
         }
     }
 }

diff --git a/ferrocene/library/libc/libc-test/build.rs b/ferrocene/library/libc/libc-test/build.rs
@@ -1863,7 +1863,8 @@ fn test_android(target: &str) {
             | "NDA_NDM_FLAGS_MASK"
             | "NDTPA_INTERVAL_PROBE_TIME_MS"
             | "NFQA_UNSPEC"
-            | "NTF_EXT_LOCKED" => true,
+            | "NTF_EXT_LOCKED"
+            | "ALG_SET_DRBG_ENTROPY" => true,
 
             _ => false,
         }
@@ -3873,6 +3874,11 @@ fn test_linux(target: &str) {
             // FIXME: Requires more recent kernel headers
             "HWTSTAMP_TX_ONESTEP_P2P" if musl => true, // linux v5.6+
 
+            // kernel 6.5 minimum
+            "MOVE_MOUNT_BENEATH" => true,
+            // FIXME: Requires linux 6.1
+            "ALG_SET_KEY_BY_KEY_SERIAL" | "ALG_SET_DRBG_ENTROPY" => true,
+
             _ => false,
         }
     });

diff --git a/ferrocene/library/libc/libc-test/semver/android.txt b/ferrocene/library/libc/libc-test/semver/android.txt
@@ -61,6 +61,7 @@ ALG_OP_DECRYPT
 ALG_OP_ENCRYPT
 ALG_SET_AEAD_ASSOCLEN
 ALG_SET_AEAD_AUTHSIZE
+ALG_SET_DRBG_ENTROPY
 ALG_SET_IV
 ALG_SET_KEY
 ALG_SET_OP

diff --git a/ferrocene/library/libc/libc-test/semver/dragonfly.txt b/ferrocene/library/libc/libc-test/semver/dragonfly.txt
@@ -1320,6 +1320,8 @@ getitimer
 getlastlogx
 getline
 getloadavg
+getmntinfo
+getmntvinfo
 getnameinfo
 getopt_long
 getpeereid
@@ -1453,6 +1455,7 @@ pthread_condattr_getpshared
 pthread_condattr_setclock
 pthread_condattr_setpshared
 pthread_get_name_np
+pthread_getname_np
 pthread_getcpuclockid
 pthread_kill
 pthread_main_np
@@ -1462,6 +1465,7 @@ pthread_mutexattr_setpshared
 pthread_rwlockattr_getpshared
 pthread_rwlockattr_setpshared
 pthread_set_name_np
+pthread_setname_np
 pthread_spin_destroy
 pthread_spin_init
 pthread_spin_lock

diff --git a/ferrocene/library/libc/libc-test/semver/freebsd.txt b/ferrocene/library/libc/libc-test/semver/freebsd.txt
@@ -972,6 +972,8 @@ PROC_WX_MAPPINGS_PERMIT
 PROC_WXMAP_CTL
 PROC_WXMAP_STATUS
 PROC_WXORX_ENFORCE
+PROT_MAX
+PROT_MAX_EXTRACT
 PTHREAD_CREATE_DETACHED
 PTHREAD_CREATE_JOINABLE
 PTHREAD_MUTEX_ADAPTIVE_NP
@@ -2027,6 +2029,7 @@ pthread_condattr_getpshared
 pthread_condattr_setclock
 pthread_condattr_setpshared
 pthread_get_name_np
+pthread_getname_np
 pthread_getaffinity_np
 pthread_getcpuclockid
 pthread_getthreadid_np
@@ -2042,6 +2045,7 @@ pthread_rwlockattr_getpshared
 pthread_rwlockattr_setpshared
 pthread_setaffinity_np
 pthread_set_name_np
+pthread_setname_np
 pthread_getschedparam
 pthread_setschedparam
 pthread_spin_destroy

diff --git a/ferrocene/library/libc/libc-test/semver/linux-gnu.txt b/ferrocene/library/libc/libc-test/semver/linux-gnu.txt
@@ -140,6 +140,14 @@ MOD_OFFSET
 MOD_STATUS
 MOD_TAI
 MOD_TIMECONST
+MOVE_MOUNT_BENEATH
+MOVE_MOUNT_F_AUTOMOUNTS
+MOVE_MOUNT_F_EMPTY_PATH
+MOVE_MOUNT_F_SYMLINKS
+MOVE_MOUNT_SET_GROUP
+MOVE_MOUNT_T_AUTOMOUNTS
+MOVE_MOUNT_T_EMPTY_PATH
+MOVE_MOUNT_T_SYMLINKS
 MPOL_BIND
 MPOL_DEFAULT
 MPOL_F_NUMA_BALANCING

diff --git a/ferrocene/library/libc/libc-test/semver/linux.txt b/ferrocene/library/libc/libc-test/semver/linux.txt
@@ -71,8 +71,10 @@ ALG_OP_DECRYPT
 ALG_OP_ENCRYPT
 ALG_SET_AEAD_ASSOCLEN
 ALG_SET_AEAD_AUTHSIZE
+ALG_SET_DRBG_ENTROPY
 ALG_SET_IV
 ALG_SET_KEY
+ALG_SET_KEY_BY_KEY_SERIAL
 ALG_SET_OP
 ALT_DIGITS
 AM_STR

diff --git a/ferrocene/library/libc/src/unix/aix/mod.rs b/ferrocene/library/libc/src/unix/aix/mod.rs
@@ -1,7 +1,6 @@
 pub type c_char = i8;
 pub type caddr_t = *mut ::c_char;
-// FIXME: clockid_t must be c_long, but time.rs accepts only i32
-pub type clockid_t = ::c_int;
+pub type clockid_t = ::c_longlong;
 pub type blkcnt_t = ::c_long;
 pub type clock_t = ::c_int;
 pub type daddr_t = ::c_long;
@@ -3275,7 +3274,13 @@ extern "C" {
     pub fn splice(socket1: ::c_int, socket2: ::c_int, flags: ::c_int) -> ::c_int;
     pub fn srand(seed: ::c_uint);
     pub fn srand48(seed: ::c_long);
-    pub fn stat64(path: *const c_char, buf: *mut stat64) -> ::c_int;
+    pub fn stat64(path: *const ::c_char, buf: *mut stat64) -> ::c_int;
+    pub fn stat64at(
+        dirfd: ::c_int,
+        path: *const ::c_char,
+        buf: *mut stat64,
+        flags: ::c_int,
+    ) -> ::c_int;
     pub fn statfs(path: *const ::c_char, buf: *mut statfs) -> ::c_int;
     pub fn statfs64(path: *const ::c_char, buf: *mut statfs64) -> ::c_int;
     pub fn statvfs64(path: *const ::c_char, buf: *mut statvfs64) -> ::c_int;

diff --git a/ferrocene/library/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/ferrocene/library/libc/src/unix/bsd/freebsdlike/dragonfly/mod.rs
@@ -1678,6 +1678,12 @@ extern "C" {
 
     pub fn dirname(path: *mut ::c_char) -> *mut ::c_char;
     pub fn basename(path: *mut ::c_char) -> *mut ::c_char;
+    pub fn getmntinfo(mntbufp: *mut *mut ::statfs, flags: ::c_int) -> ::c_int;
+    pub fn getmntvinfo(
+        mntbufp: *mut *mut ::statfs,
+        mntvbufp: *mut *mut ::statvfs,
+        flags: ::c_int,
+    ) -> ::c_int;
 }
 
 #[link(name = "rt")]

diff --git a/ferrocene/library/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs b/ferrocene/library/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -4857,6 +4857,14 @@ f! {
         };
         ::mem::size_of::<sockcred2>() + ::mem::size_of::<::gid_t>() * ngrps
     }
+
+    pub fn PROT_MAX(x: ::c_int) -> ::c_int {
+        x << 16
+    }
+
+    pub fn PROT_MAX_EXTRACT(x: ::c_int) -> ::c_int {
+        (x >> 16) & (::PROT_READ | ::PROT_WRITE | ::PROT_EXEC)
+    }
 }
 
 safe_f! {

diff --git a/ferrocene/library/libc/src/unix/bsd/freebsdlike/mod.rs b/ferrocene/library/libc/src/unix/bsd/freebsdlike/mod.rs
@@ -1646,6 +1646,12 @@ extern "C" {
     pub fn pthread_barrier_wait(barrier: *mut pthread_barrier_t) -> ::c_int;
     pub fn pthread_get_name_np(tid: ::pthread_t, name: *mut ::c_char, len: ::size_t);
     pub fn pthread_set_name_np(tid: ::pthread_t, name: *const ::c_char);
+    pub fn pthread_getname_np(
+        thread: ::pthread_t,
+        buffer: *mut ::c_char,
+        length: ::size_t,
+    ) -> ::c_int;
+    pub fn pthread_setname_np(thread: ::pthread_t, name: *const ::c_char) -> ::c_int;
     pub fn pthread_setschedparam(
         native: ::pthread_t,
         policy: ::c_int,

diff --git a/ferrocene/library/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs b/ferrocene/library/libc/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -3203,6 +3203,9 @@ cfg_if! {
     } else if #[cfg(target_arch = "x86")] {
         mod x86;
         pub use self::x86::*;
+    } else if #[cfg(target_arch = "riscv64")] {
+        mod riscv64;
+        pub use self::riscv64::*;
     } else {
         // Unknown target_arch
     }

diff --git a/ferrocene/library/libc/src/unix/bsd/netbsdlike/netbsd/riscv64.rs b/ferrocene/library/libc/src/unix/bsd/netbsdlike/netbsd/riscv64.rs
@@ -0,0 +1,21 @@
+use PT_FIRSTMACH;
+
+pub type c_long = i64;
+pub type c_ulong = u64;
+pub type c_char = u8;
+pub type __cpu_simple_lock_nv_t = ::c_int;
+
+cfg_if! {
+    if #[cfg(libc_const_size_of)] {
+        #[doc(hidden)]
+        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_long>() - 1;
+    } else {
+        #[doc(hidden)]
+        pub const _ALIGNBYTES: usize = 8 - 1;
+    }
+}
+
+pub const PT_GETREGS: ::c_int = PT_FIRSTMACH + 0;
+pub const PT_SETREGS: ::c_int = PT_FIRSTMACH + 1;
+pub const PT_GETFPREGS: ::c_int = PT_FIRSTMACH + 2;
+pub const PT_SETFPREGS: ::c_int = PT_FIRSTMACH + 3;