[0.2] Backports

libc-test/build.rs

@@ -5702,6 +5702,18 @@ fn test_aix(target: &str) {
             // allow type 'double' to be used in signal contexts.
             "fpreg_t" => true,
 
+            // This type is defined for a union used within `struct ld_info`.
+            // The AIX header does not declare a separate standalone union
+            // type for it.
+            "__ld_info_file" => true,
+
+            // This is a simplified version of the AIX union `_simple_lock`.
+            "_kernel_simple_lock" => true,
+
+            // These structures are guarded by the `_KERNEL` macro in the AIX
+            // header.
+            "fileops_t" | "file" => true,
+
             _ => false,
         }
     });
@@ -5719,6 +5731,11 @@ fn test_aix(target: &str) {
             // The _ALL_SOURCE type of 'f_fsid' differs from POSIX's on AIX.
             ("statvfs", "f_fsid") => true,
 
+            // The type of `_file` is `__ld_info_file`, which is defined
+            // specifically for the union inside `struct ld_info`. The AIX
+            // header does not define a separate standalone union type for it.
+            ("ld_info", "_file") => true,
+
             _ => false,
         }
     });

libc-test/semver/aix.txt

@@ -1791,12 +1791,14 @@ _W_STOPPED
 _W_STRC
 __context64
 __extctx_t
+__ld_info_file
 __pollfd_ext_u
 __tm_context_t
 __vmx_context_t
 __vmxreg_t
 __vsx_context_t
 _exit
+_kernel_simple_lock
 abort
 accept
 access
@@ -1915,7 +1917,9 @@ fgetpos
 fgetpos64
 fgetpwent
 fgets
+file
 fileno
+fileops_t
 flock
 flock64
 fnmatch
@@ -2079,6 +2083,7 @@ kill
 lchown
 lcong48
 lconv
+ld_info
 lfind
 linger
 link
@@ -2090,6 +2095,7 @@ locale_t
 localeconv
 localtime
 localtime_r
+lock_data_instrumented
 lpar_get_info
 lpar_set_resources
 lrand48

libc-test/semver/android.txt

@@ -1947,17 +1947,171 @@ PROT_GROWSUP
 PROT_NONE
 PROT_READ
 PROT_WRITE
+PR_CAPBSET_DROP
+PR_CAPBSET_READ
+PR_CAP_AMBIENT
+PR_CAP_AMBIENT_CLEAR_ALL
+PR_CAP_AMBIENT_IS_SET
+PR_CAP_AMBIENT_LOWER
+PR_CAP_AMBIENT_RAISE
+PR_ENDIAN_BIG
+PR_ENDIAN_LITTLE
+PR_ENDIAN_PPC_LITTLE
+PR_FPEMU_NOPRINT
+PR_FPEMU_SIGFPE
+PR_FP_EXC_ASYNC
+PR_FP_EXC_DISABLED
+PR_FP_EXC_DIV
+PR_FP_EXC_INV
+PR_FP_EXC_NONRECOV
+PR_FP_EXC_OVF
+PR_FP_EXC_PRECISE
+PR_FP_EXC_RES
+PR_FP_EXC_SW_ENABLE
+PR_FP_EXC_UND
+PR_FP_MODE_FR
+PR_FP_MODE_FRE
+PR_GET_AUXV
+PR_GET_CHILD_SUBREAPER
+PR_GET_DUMPABLE
+PR_GET_ENDIAN
+PR_GET_FPEMU
+PR_GET_FPEXC
+PR_GET_FP_MODE
+PR_GET_IO_FLUSHER
+PR_GET_KEEPCAPS
+PR_GET_MDWE
+PR_GET_MEMORY_MERGE
 PR_GET_NAME
 PR_GET_NO_NEW_PRIVS
+PR_GET_PDEATHSIG
 PR_GET_SECCOMP
+PR_GET_SECUREBITS
+PR_GET_SPECULATION_CTRL
+PR_GET_TAGGED_ADDR_CTRL
+PR_GET_THP_DISABLE
+PR_GET_TID_ADDRESS
+PR_GET_TIMERSLACK
 PR_GET_TIMING
+PR_GET_TSC
+PR_GET_UNALIGN
+PR_MCE_KILL
+PR_MCE_KILL_CLEAR
+PR_MCE_KILL_DEFAULT
+PR_MCE_KILL_EARLY
+PR_MCE_KILL_GET
+PR_MCE_KILL_LATE
+PR_MCE_KILL_SET
+PR_MDWE_NO_INHERIT
+PR_MDWE_REFUSE_EXEC_GAIN
+PR_MPX_DISABLE_MANAGEMENT
+PR_MPX_ENABLE_MANAGEMENT
+PR_MTE_TAG_MASK
+PR_MTE_TAG_SHIFT
+PR_MTE_TCF_ASYNC
+PR_MTE_TCF_MASK
+PR_MTE_TCF_NONE
+PR_MTE_TCF_SHIFT
+PR_MTE_TCF_SYNC
+PR_PAC_APDAKEY
+PR_PAC_APDBKEY
+PR_PAC_APGAKEY
+PR_PAC_APIAKEY
+PR_PAC_APIBKEY
+PR_PAC_GET_ENABLED_KEYS
+PR_PAC_RESET_KEYS
+PR_PAC_SET_ENABLED_KEYS
+PR_RISCV_V_GET_CONTROL
+PR_RISCV_V_SET_CONTROL
+PR_RISCV_V_VSTATE_CTRL_CUR_MASK
+PR_RISCV_V_VSTATE_CTRL_DEFAULT
+PR_RISCV_V_VSTATE_CTRL_INHERIT
+PR_RISCV_V_VSTATE_CTRL_MASK
+PR_RISCV_V_VSTATE_CTRL_NEXT_MASK
+PR_RISCV_V_VSTATE_CTRL_OFF
+PR_RISCV_V_VSTATE_CTRL_ON
+PR_SCHED_CORE
+PR_SCHED_CORE_CREATE
+PR_SCHED_CORE_GET
+PR_SCHED_CORE_MAX
+PR_SCHED_CORE_SCOPE_PROCESS_GROUP
+PR_SCHED_CORE_SCOPE_THREAD
+PR_SCHED_CORE_SCOPE_THREAD_GROUP
+PR_SCHED_CORE_SHARE_FROM
+PR_SCHED_CORE_SHARE_TO
+PR_SET_CHILD_SUBREAPER
+PR_SET_DUMPABLE
+PR_SET_ENDIAN
+PR_SET_FPEMU
+PR_SET_FPEXC
+PR_SET_FP_MODE
+PR_SET_IO_FLUSHER
+PR_SET_KEEPCAPS
+PR_SET_MDWE
+PR_SET_MEMORY_MERGE
+PR_SET_MM
+PR_SET_MM_ARG_END
+PR_SET_MM_ARG_START
+PR_SET_MM_AUXV
+PR_SET_MM_BRK
+PR_SET_MM_END_CODE
+PR_SET_MM_END_DATA
+PR_SET_MM_ENV_END
+PR_SET_MM_ENV_START
+PR_SET_MM_EXE_FILE
+PR_SET_MM_MAP
+PR_SET_MM_MAP_SIZE
+PR_SET_MM_START_BRK
+PR_SET_MM_START_CODE
+PR_SET_MM_START_DATA
+PR_SET_MM_START_STACK
 PR_SET_NAME
 PR_SET_NO_NEW_PRIVS
+PR_SET_PDEATHSIG
+PR_SET_PTRACER
+PR_SET_PTRACER_ANY
 PR_SET_SECCOMP
+PR_SET_SECUREBITS
+PR_SET_SPECULATION_CTRL
+PR_SET_SYSCALL_USER_DISPATCH
+PR_SET_TAGGED_ADDR_CTRL
+PR_SET_THP_DISABLE
+PR_SET_TIMERSLACK
+PR_SET_TIMING
+PR_SET_TSC
+PR_SET_UNALIGN
 PR_SET_VMA
 PR_SET_VMA_ANON_NAME
+PR_SME_GET_VL
+PR_SME_SET_VL
+PR_SME_SET_VL_ONEXEC
+PR_SME_VL_INHERIT
+PR_SME_VL_LEN_MASK
+PR_SPEC_DISABLE
+PR_SPEC_DISABLE_NOEXEC
+PR_SPEC_ENABLE
+PR_SPEC_FORCE_DISABLE
+PR_SPEC_INDIRECT_BRANCH
+PR_SPEC_L1D_FLUSH
+PR_SPEC_NOT_AFFECTED
+PR_SPEC_PRCTL
+PR_SPEC_STORE_BYPASS
+PR_SVE_GET_VL
+PR_SVE_SET_VL
+PR_SVE_SET_VL_ONEXEC
+PR_SVE_VL_INHERIT
+PR_SVE_VL_LEN_MASK
+PR_SYS_DISPATCH_OFF
+PR_SYS_DISPATCH_ON
+PR_TAGGED_ADDR_ENABLE
+PR_TASK_PERF_EVENTS_DISABLE
+PR_TASK_PERF_EVENTS_ENABLE
 PR_TIMING_STATISTICAL
 PR_TIMING_TIMESTAMP
+PR_TSC_ENABLE
+PR_TSC_SIGSEGV
+PR_UNALIGN_NOPRINT
+PR_UNALIGN_SIGBUS
 PTHREAD_BARRIER_SERIAL_THREAD
 PTHREAD_COND_INITIALIZER
 PTHREAD_CREATE_DETACHED
@@ -2516,6 +2670,8 @@ SW_CNT
 SW_MAX
 SYN_CNT
 SYN_MAX
+SYSCALL_DISPATCH_FILTER_ALLOW
+SYSCALL_DISPATCH_FILTER_BLOCK
 SYS_accept4
 SYS_acct
 SYS_add_key

libc-test/semver/netbsd.txt

@@ -426,6 +426,17 @@ IFF_SIMPLEX
 IFF_UP
 IMAXBEL
 INIT_PROCESS
+IOCBASECMD
+IOCGROUP
+IOCGROUP_SHIFT
+IOCPARM_LEN
+IOCPARM_MASK
+IOCPARM_SHIFT
+IOC_DIRMASK
+IOC_IN
+IOC_INOUT
+IOC_OUT
+IOC_VOID
 IOV_MAX
 IPC_CREAT
 IPC_EXCL
@@ -1116,9 +1127,14 @@ XATTR_CREATE
 XATTR_REPLACE
 YESEXPR
 YESSTR
+_IO
+_IOC
 _IOFBF
 _IOLBF
 _IONBF
+_IOR
+_IOW
+_IOWR
 _PC_2_SYMLINKS
 _PC_ACL_EXTENDED
 _PC_FILESIZEBITS

libc-test/semver/openbsd.txt

@@ -267,6 +267,15 @@ IFF_SIMPLEX
 IFF_STATICARP
 IFF_UP
 IMAXBEL
+IOCBASECMD
+IOCGROUP
+IOCPARM_LEN
+IOCPARM_MASK
+IOC_DIRMASK
+IOC_IN
+IOC_INOUT
+IOC_OUT
+IOC_VOID
 IOV_MAX
 IPC_CREAT
 IPC_EXCL
@@ -912,9 +921,14 @@ WSTOPPED
 WTRAPPED
 YESEXPR
 YESSTR
+_IO
+_IOC
 _IOFBF
 _IOLBF
 _IONBF
+_IOR
+_IOW
+_IOWR
 _MAX_PAGE_SHIFT
 _PC_2_SYMLINKS
 _PC_ALLOC_SIZE_MIN

src/lib.rs

@@ -4,12 +4,20 @@
 #![allow(
     renamed_and_removed_lints, // Keep this order.
     unknown_lints, // Keep this order.
-    bad_style,
+    nonstandard_style,
     overflowing_literals,
-    improper_ctypes,
     unused_macros,
     unused_macro_rules,
 )]
+// Prepare for a future upgrade
+#![warn(rust_2024_compatibility)]
+// Things missing for 2024 that are blocked on MSRV or breakage
+#![allow(
+    missing_unsafe_on_extern,
+    edition_2024_expr_fragment_specifier,
+    // Allowed globally, the warning is enabled in individual modules as we work through them
+    unsafe_op_in_unsafe_fn
+)]
 #![cfg_attr(libc_deny_warnings, deny(warnings))]
 // Attributes needed when building as part of the standard library
 #![cfg_attr(feature = "rustc-dep-of-std", feature(link_cfg, no_core))]

src/unix/aix/mod.rs

@@ -1159,10 +1159,6 @@ pub const NFSMNT_ACDIRMAX: c_int = 0x0800;
 // rpcsvc/rstat.h
 pub const CPUSTATES: c_int = 4;
 
-// search.h
-pub const FIND: c_int = 0;
-pub const ENTER: c_int = 1;
-
 // semaphore.h
 pub const SEM_FAILED: *mut sem_t = -1isize as *mut crate::sem_t;