Merge #79

79: 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#3408 * rust-lang/libc#3163 * rust-lang/libc#3328 * rust-lang/libc#3393 * rust-lang/libc#3418 Co-authored-by: Peter Zhang <mbyzhang@outlook.com> Co-authored-by: Vincent Isambart <vincent-isambart@cookpad.com> Co-authored-by: brijesh <brijeshkrishnaga@gmail.com> Co-authored-by: Aurélien Deharbe <aurelien.deharbe@gmail.com> Co-authored-by: bors <bors@rust-lang.org> Co-authored-by: Yuki Okushi <jtitor@2k36.org> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ferrocene · Nov 2, 2023 · 9860065 · 9860065
2 parents 0800006 + a1dfcfe
commit 9860065
Show file tree

Hide file tree

Showing 40 changed files with 225 additions and 55 deletions.
diff --git a/ferrocene/library/libc/ci/docker/aarch64-linux-android/Dockerfile b/ferrocene/library/libc/ci/docker/aarch64-linux-android/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN dpkg --add-architecture i386
 RUN apt-get update

diff --git a/ferrocene/library/libc/ci/docker/aarch64-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/aarch64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc libc6-dev ca-certificates \
   gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user

diff --git a/ferrocene/library/libc/ci/docker/aarch64-unknown-linux-musl/Dockerfile b/ferrocene/library/libc/ci/docker/aarch64-unknown-linux-musl/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc make libc6-dev git curl ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/arm-linux-androideabi/Dockerfile b/ferrocene/library/libc/ci/docker/arm-linux-androideabi/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN dpkg --add-architecture i386
 RUN apt-get update

diff --git a/ferrocene/library/libc/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/ferrocene/library/libc/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc libc6-dev ca-certificates \
   gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user

diff --git a/ferrocene/library/libc/ci/docker/arm-unknown-linux-musleabihf/Dockerfile b/ferrocene/library/libc/ci/docker/arm-unknown-linux-musleabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc make libc6-dev git curl ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile b/ferrocene/library/libc/ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates qemu-system-arm curl \

diff --git a/ferrocene/library/libc/ci/docker/asmjs-unknown-emscripten/Dockerfile b/ferrocene/library/libc/ci/docker/asmjs-unknown-emscripten/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 # This is a workaround to avoid the interaction with tzdata.
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/ferrocene/library/libc/ci/docker/i686-linux-android/Dockerfile b/ferrocene/library/libc/ci/docker/i686-linux-android/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN dpkg --add-architecture i386
 RUN apt-get update

diff --git a/ferrocene/library/libc/ci/docker/i686-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/i686-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
   gcc-multilib libc6-dev ca-certificates

diff --git a/ferrocene/library/libc/ci/docker/i686-unknown-linux-musl/Dockerfile b/ferrocene/library/libc/ci/docker/i686-unknown-linux-musl/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN dpkg --add-architecture i386
 RUN apt-get update

diff --git a/ferrocene/library/libc/ci/docker/mips-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/mips-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/mips-unknown-linux-musl/Dockerfile b/ferrocene/library/libc/ci/docker/mips-unknown-linux-musl/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \

diff --git a/ferrocene/library/libc/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile b/ferrocene/library/libc/ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/mips64-unknown-linux-muslabi64/Dockerfile b/ferrocene/library/libc/ci/docker/mips64-unknown-linux-muslabi64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc make libc6-dev git curl ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile b/ferrocene/library/libc/ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/mips64el-unknown-linux-muslabi64/Dockerfile b/ferrocene/library/libc/ci/docker/mips64el-unknown-linux-muslabi64/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc make libc6-dev git curl ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/mipsel-unknown-linux-musl/Dockerfile b/ferrocene/library/libc/ci/docker/mipsel-unknown-linux-musl/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates qemu-system-mipsel curl \

diff --git a/ferrocene/library/libc/ci/docker/mipsel-unknown-linux-uclibc/Dockerfile b/ferrocene/library/libc/ci/docker/mipsel-unknown-linux-uclibc/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates qemu-system-mipsel curl \

diff --git a/ferrocene/library/libc/ci/docker/powerpc-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/powerpc-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc libc6-dev qemu-user ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/s390x-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/s390x-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         curl ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/s390x-unknown-linux-musl/Dockerfile b/ferrocene/library/libc/ci/docker/s390x-unknown-linux-musl/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         curl ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/sparc64-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/sparc64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         curl ca-certificates \

diff --git a/ferrocene/library/libc/ci/docker/wasm32-unknown-emscripten/Dockerfile b/ferrocene/library/libc/ci/docker/wasm32-unknown-emscripten/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 # This is a workaround to avoid the interaction with tzdata.
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/ferrocene/library/libc/ci/docker/wasm32-wasi/Dockerfile b/ferrocene/library/libc/ci/docker/wasm32-wasi/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

diff --git a/ferrocene/library/libc/ci/docker/x86_64-linux-android/Dockerfile b/ferrocene/library/libc/ci/docker/x86_64-linux-android/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

diff --git a/ferrocene/library/libc/ci/docker/x86_64-unknown-linux-gnu/Dockerfile b/ferrocene/library/libc/ci/docker/x86_64-unknown-linux-gnu/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
   gcc libc6-dev ca-certificates linux-headers-generic

diff --git a/ferrocene/library/libc/ci/docker/x86_64-unknown-linux-gnux32/Dockerfile b/ferrocene/library/libc/ci/docker/x86_64-unknown-linux-gnux32/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends \
   gcc-multilib libc6-dev ca-certificates

diff --git a/ferrocene/library/libc/ci/docker/x86_64-unknown-linux-musl/Dockerfile b/ferrocene/library/libc/ci/docker/x86_64-unknown-linux-musl/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:23.10
 
 RUN apt-get update
 RUN apt-get install -y --no-install-recommends \

diff --git a/ferrocene/library/libc/libc-test/build.rs b/ferrocene/library/libc/libc-test/build.rs
@@ -3589,6 +3589,10 @@ fn test_linux(target: &str) {
 
             // FIXME: requires >= 6.1 kernel headers
             "canxl_frame" => true,
+
+            // FIXME: The size of `iv` has been changed since Linux v6.0
+            // https://github.com/torvalds/linux/commit/94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
+            "af_alg_iv" => true,
             _ => false,
         }
     });
@@ -3739,8 +3743,6 @@ fn test_linux(target: &str) {
 
             // kernel constants not available in uclibc 1.0.34
             | "EXTPROC"
-            | "FAN_MARK_FILESYSTEM"
-            | "FAN_MARK_INODE"
             | "IPPROTO_BEETPH"
             | "IPPROTO_MPLS"
             | "IPV6_HDRINCL"
@@ -3879,6 +3881,39 @@ fn test_linux(target: &str) {
             // FIXME: Requires linux 6.1
             "ALG_SET_KEY_BY_KEY_SERIAL" | "ALG_SET_DRBG_ENTROPY" => true,
 
+            // FIXME: Requires more recent kernel headers
+            | "FAN_FS_ERROR"                      // linux v5.16+
+            | "FAN_RENAME"                        // linux v5.17+
+            | "FAN_REPORT_TARGET_FID"             // linux v5.17+
+            | "FAN_REPORT_DFID_NAME_TARGET"       // linux v5.17+
+            | "FAN_MARK_EVICTABLE"                // linux v5.19+
+            | "FAN_MARK_IGNORE"                   // linux v6.0+
+            | "FAN_MARK_IGNORE_SURV"              // linux v6.0+
+            | "FAN_EVENT_INFO_TYPE_ERROR"         // linux v5.16+
+            | "FAN_EVENT_INFO_TYPE_OLD_DFID_NAME" // linux v5.17+
+            | "FAN_EVENT_INFO_TYPE_NEW_DFID_NAME" // linux v5.17+
+            | "FAN_RESPONSE_INFO_NONE"            // linux v5.16+
+            | "FAN_RESPONSE_INFO_AUDIT_RULE"      // linux v5.16+
+            | "FAN_INFO"                          // linux v5.16+
+                => true,
+
+            // FIXME: Requires linux 5.15+
+            "FAN_REPORT_PIDFD" if musl => true,
+
+            // FIXME: Requires linux 5.9+
+            | "FAN_REPORT_DIR_FID"
+            | "FAN_REPORT_NAME"
+            | "FAN_REPORT_DFID_NAME"
+            | "FAN_EVENT_INFO_TYPE_DFID_NAME"
+            | "FAN_EVENT_INFO_TYPE_DFID"
+            | "FAN_EVENT_INFO_TYPE_PIDFD"
+            | "FAN_NOPIDFD"
+            | "FAN_EPIDFD"
+            if musl => true,
+
+            // FIXME: Requires linux 6.5
+            "NFT_MSG_MAX" => true,
+
             _ => false,
         }
     });
@@ -3985,6 +4020,9 @@ fn test_linux(target: &str) {
             "posix_basename" if gnu => true,
             "gnu_basename" if gnu => true,
 
+            // FIXME: function pointers changed since Ubuntu 23.10
+            "strtol" | "strtoll" | "strtoul" | "strtoull" | "fscanf" | "scanf" | "sscanf" => true,
+
             _ => false,
         }
     });
@@ -4058,6 +4096,8 @@ fn test_linux(target: &str) {
         (struct_ == "sockaddr_vm" && field == "svm_zero") ||
         // the `ifr_ifru` field is an anonymous union
         (struct_ == "ifreq" && field == "ifr_ifru") ||
+        // the `ifc_ifcu` field is an anonymous union
+        (struct_ == "ifconf" && field == "ifc_ifcu") ||
         // glibc uses a single array `uregs` instead of individual fields.
         (struct_ == "user_regs" && arm)
     });

diff --git a/ferrocene/library/libc/libc-test/semver/apple.txt b/ferrocene/library/libc/libc-test/semver/apple.txt
@@ -2084,6 +2084,8 @@ posix_spawnattr_setflags
 posix_spawnattr_setpgroup
 posix_spawnattr_setsigdefault
 posix_spawnattr_setsigmask
+posix_spawnattr_getbinpref_np
+posix_spawnattr_setbinpref_np
 posix_spawnattr_t
 posix_spawnp
 preadv

diff --git a/ferrocene/library/libc/libc-test/semver/linux.txt b/ferrocene/library/libc/libc-test/semver/linux.txt
@@ -719,32 +719,69 @@ FANOTIFY_METADATA_VERSION
 FAN_ACCESS
 FAN_ACCESS_PERM
 FAN_ALLOW
+FAN_ATTRIB
+FAN_AUDIT
 FAN_CLASS_CONTENT
 FAN_CLASS_NOTIF
 FAN_CLASS_PRE_CONTENT
 FAN_CLOEXEC
 FAN_CLOSE
 FAN_CLOSE_NOWRITE
 FAN_CLOSE_WRITE
+FAN_CREATE
+FAN_DELETE
+FAN_DELETE_SELF
 FAN_DENY
+FAN_ENABLE_AUDIT
+FAN_EPIDFD
+FAN_EVENT_INFO_TYPE_DFID
+FAN_EVENT_INFO_TYPE_DFID_NAME
+FAN_EVENT_INFO_TYPE_ERROR
+FAN_EVENT_INFO_TYPE_FID
+FAN_EVENT_INFO_TYPE_NEW_DFID_NAME
+FAN_EVENT_INFO_TYPE_OLD_DFID_NAME
+FAN_EVENT_INFO_TYPE_PIDFD
 FAN_EVENT_ON_CHILD
+FAN_FS_ERROR
+FAN_INFO
 FAN_MARK_ADD
 FAN_MARK_DONT_FOLLOW
+FAN_MARK_EVICTABLE
 FAN_MARK_FILESYSTEM
 FAN_MARK_FLUSH
+FAN_MARK_IGNORE
 FAN_MARK_IGNORED_MASK
 FAN_MARK_IGNORED_SURV_MODIFY
+FAN_MARK_IGNORE_SURV
 FAN_MARK_INODE
 FAN_MARK_MOUNT
 FAN_MARK_ONLYDIR
 FAN_MARK_REMOVE
 FAN_MODIFY
+FAN_MOVE
+FAN_MOVED_FROM
+FAN_MOVED_TO
+FAN_MOVE_SELF
 FAN_NOFD
 FAN_NONBLOCK
+FAN_NOPIDFD
 FAN_ONDIR
 FAN_OPEN
+FAN_OPEN_EXEC
+FAN_OPEN_EXEC_PERM
 FAN_OPEN_PERM
 FAN_Q_OVERFLOW
+FAN_RENAME
+FAN_REPORT_DFID_NAME
+FAN_REPORT_DFID_NAME_TARGET
+FAN_REPORT_DIR_FID
+FAN_REPORT_FID
+FAN_REPORT_NAME
+FAN_REPORT_PIDFD
+FAN_REPORT_TARGET_FID
+FAN_REPORT_TID
+FAN_RESPONSE_INFO_AUDIT_RULE
+FAN_RESPONSE_INFO_NONE
 FAN_UNLIMITED_MARKS
 FAN_UNLIMITED_QUEUE
 FF0
@@ -1954,6 +1991,7 @@ PTRACE_EVENT_VFORK_DONE
 PTRACE_GETEVENTMSG
 PTRACE_GETREGSET
 PTRACE_GETSIGINFO
+PTRACE_GETSIGMASK
 PTRACE_INTERRUPT
 PTRACE_KILL
 PTRACE_LISTEN
@@ -1979,6 +2017,7 @@ PTRACE_SEIZE
 PTRACE_SETOPTIONS
 PTRACE_SETREGSET
 PTRACE_SETSIGINFO
+PTRACE_SETSIGMASK
 PTRACE_SINGLESTEP
 PTRACE_SYSCALL
 PTRACE_TRACEME
@@ -3211,6 +3250,7 @@ if_freenameindex
 if_nameindex
 ifaddrs
 ifreq
+ifconf
 in6_ifreq
 in6_pktinfo
 in6_rtmsg