Merge remote-tracking branch 'rust-lang/master' into horizon-getrandom-and-fixes

# Conflicts:
#	src/unix/mod.rs
#	src/unix/newlib/horizon/mod.rs

Author: AzureMarker

libc-test/build.rs

@@ -2921,6 +2921,8 @@ fn test_linux(target: &str) {
         "asm/mman.h",
         "linux/can.h",
         "linux/can/raw.h",
+        // FIXME: requires kernel headers >= 5.4.1.
+        [!musl]: "linux/can/j1939.h",
         "linux/dccp.h",
         "linux/errqueue.h",
         "linux/falloc.h",
@@ -3046,6 +3048,11 @@ fn test_linux(target: &str) {
             // For internal use only, to define architecture specific ioctl constants with a libc specific type.
             "Ioctl" => true,
 
+            // FIXME: requires >= 5.4.1 kernel headers
+            "pgn_t" if musl => true,
+            "priority_t" if musl => true,
+            "name_t" if musl => true,
+
             _ => false,
         }
     });
@@ -3107,6 +3114,9 @@ fn test_linux(target: &str) {
             // Might differ between kernel versions
             "open_how" => true,
 
+            // FIXME: requires >= 5.4.1 kernel headers
+            "j1939_filter" if musl => true,
+
             _ => false,
         }
     });
@@ -3141,6 +3151,12 @@ fn test_linux(target: &str) {
                 || name.starts_with("TCP_")
                 || name.starts_with("UINPUT_")
                 || name.starts_with("VMADDR_")
+                // FIXME: Requires >= 5.4.1 kernel headers
+                || name.starts_with("J1939")
+                // FIXME: Requires >= 5.4.1 kernel headers
+                || name.starts_with("SO_J1939")
+                // FIXME: Requires >= 5.4.1 kernel headers
+                || name.starts_with("SCM_J1939")
             {
                 return true;
             }
@@ -3237,6 +3253,18 @@ fn test_linux(target: &str) {
             | "CAN_RAW_FILTER_MAX"
             | "CAN_NPROTO" => true,
 
+            // FIXME: Requires recent kernel headers (5.15)
+            | "J1939_NLA_TOTAL_SIZE"
+            | "J1939_NLA_PGN"
+            | "J1939_NLA_SRC_NAME"
+            | "J1939_NLA_DEST_NAME"
+            | "J1939_NLA_SRC_ADDR"
+            | "J1939_NLA_DEST_ADDR"
+            | "J1939_EE_INFO_RX_RTS"
+            | "J1939_EE_INFO_RX_DPO"
+            | "J1939_EE_INFO_RX_ABORT"
+            | "SOL_CAN_J1939" => true,
+
             // FIXME: Requires recent kernel headers (5.8):
             "STATX_MNT_ID" => true,
 
@@ -3649,6 +3677,7 @@ fn test_haiku(target: &str) {
     let mut cfg = ctest_cfg();
     cfg.flag("-Wno-deprecated-declarations");
     cfg.define("__USE_GNU", Some("1"));
+    cfg.define("_GNU_SOURCE", None);
 
     // POSIX API
     headers! { cfg:
@@ -3751,13 +3780,17 @@ fn test_haiku(target: &str) {
                "uchar.h",
                "unistd.h",
                "utime.h",
+               "utmpx.h",
                "wchar.h",
                "wchar_t.h",
                "wctype.h"
     }
 
     // BSD Extensions
     headers! { cfg:
+               "ifaddrs.h",
+               "libutil.h",
+               "link.h",
                "pty.h",
     }
 
@@ -3803,6 +3836,11 @@ fn test_haiku(target: &str) {
             // with mem::zeroed(), so skip the automated test
             "image_info" | "thread_info" => true,
 
+            "Elf64_Phdr" => true,
+
+            // is an union
+            "cpuid_info" => true,
+
             _ => false,
         }
     });
@@ -3839,6 +3877,8 @@ fn test_haiku(target: &str) {
             // translated into a struct argument
             "find_path" => true,
 
+            "get_cpuid" => true,
+
             _ => false,
         }
     });

libc-test/semver/linux.txt

@@ -988,6 +988,24 @@ ITIMER_PROF
 ITIMER_REAL
 ITIMER_VIRTUAL
 IUTF8
+J1939_IDLE_ADDR
+J1939_MAX_UNICAST_ADDR
+J1939_NLA_BYTES_ACKED
+J1939_NLA_DEST_ADDR
+J1939_NLA_DEST_NAME
+J1939_NLA_PAD
+J1939_NLA_PGN
+J1939_NLA_SRC_ADDR
+J1939_NLA_SRC_NAME
+J1939_NLA_TOTAL_SIZE
+J1939_NO_ADDR
+J1939_NO_NAME
+J1939_NO_PGN
+J1939_PGN_ADDRESS_CLAIMED
+J1939_PGN_ADDRESS_COMMANDED
+J1939_PGN_MAX
+J1939_PGN_PDU1_MAX
+J1939_PGN_REQUEST
 KEYCTL_ASSUME_AUTHORITY
 KEYCTL_CHOWN
 KEYCTL_CLEAR
@@ -1947,6 +1965,10 @@ SCHED_RESET_ON_FORK
 SCHED_RR
 SCM_CREDENTIALS
 SCM_RIGHTS
+SCM_J1939_DEST_ADDR
+SCM_J1939_DEST_NAME
+SCM_J1939_ERRQUEUE
+SCM_J1939_PRIO
 SCM_TIMESTAMP
 SCM_TIMESTAMPING
 SECCOMP_FILTER_FLAG_LOG
@@ -2049,6 +2071,7 @@ SOL_ALG
 SOL_ATM
 SOL_BLUETOOTH
 SOL_CAN_BASE
+SOL_CAN_J1939
 SOL_CAN_RAW
 SOL_DCCP
 SOL_DECNET
@@ -2075,6 +2098,10 @@ SO_EE_ORIGIN_NONE
 SO_EE_ORIGIN_TIMESTAMPING
 SO_EE_ORIGIN_TXSTATUS
 SO_MARK
+SO_J1939_ERRQUEUE
+SO_J1939_FILTER
+SO_J1939_PROMISC
+SO_J1939_SEND_PRIO
 SO_ORIGINAL_DST
 SO_PASSCRED
 SO_PASSSEC
@@ -2801,6 +2828,7 @@ ip_mreqn
 ip_mreq_source
 ipc_perm
 itimerspec
+j1939_filter
 key_t
 killpg
 labs
@@ -2854,6 +2882,7 @@ msgqnum_t
 msgrcv
 msgsnd
 msqid_ds
+name_t
 newlocale
 nice
 nl_item
@@ -2872,6 +2901,7 @@ openpty
 packet_mreq
 pause
 personality
+pgn_t
 pipe2
 popen
 posix_fadvise
@@ -2904,6 +2934,7 @@ posix_spawnattr_t
 posix_spawnp
 ppoll
 prctl
+priority_t
 pread64
 preadv
 pthread_attr_getguardsize

libc-test/semver/openbsd.txt

@@ -156,6 +156,7 @@ ENOTBLK
 ENOMEDIUM
 ENOTRECOVERABLE
 ENOTSUP
+ENTER
 EOF
 EOWNERDEAD
 EPROCLIM
@@ -189,6 +190,7 @@ EV_SYSFLAGS
 EXTA
 EXTB
 EXTPROC
+FIND
 Elf32_Addr
 Elf32_Half
 Elf32_Lword
@@ -993,6 +995,9 @@ getthrid
 glob
 glob_t
 globfree
+hcreate
+hdestroy
+hsearch
 id_t
 if_data
 if_freenameindex

src/solid/mod.rs

@@ -535,8 +535,8 @@ extern "C" {
     pub fn strtod_l(arg1: *const c_char, arg2: *mut *mut c_char, arg3: locale_t) -> f64;
     pub fn strtof_l(arg1: *const c_char, arg2: *mut *mut c_char, arg3: locale_t) -> f32;
     pub fn strtold_l(arg1: *const c_char, arg2: *mut *mut c_char, arg3: locale_t) -> f64;
-    pub fn _Exit(arg1: c_int);
-    pub fn abort();
+    pub fn _Exit(arg1: c_int) -> !;
+    pub fn abort() -> !;
     pub fn abs(arg1: c_int) -> c_int;
     pub fn atexit(arg1: ::Option<unsafe extern "C" fn()>) -> c_int;
     pub fn atoi(arg1: *const c_char) -> c_int;
@@ -553,7 +553,7 @@ extern "C" {
     ) -> *mut c_void;
     pub fn calloc(arg1: size_t, arg2: size_t) -> *mut c_void;
     pub fn div(arg1: c_int, arg2: c_int) -> div_t;
-    pub fn exit(arg1: c_int);
+    pub fn exit(arg1: c_int) -> !;
     pub fn free(arg1: *mut c_void);
     pub fn getenv(arg1: *const c_char) -> *mut c_char;
     pub fn labs(arg1: c_long) -> c_long;

src/unix/bsd/netbsdlike/openbsd/mod.rs

@@ -35,6 +35,11 @@ pub type Elf64_Sxword = i64;
 pub type Elf64_Word = u32;
 pub type Elf64_Xword = u64;
 
+// search.h
+
+pub type ENTRY = entry;
+pub type ACTION = ::c_uint;
+
 cfg_if! {
     if #[cfg(target_pointer_width = "64")] {
         type Elf_Addr = Elf64_Addr;
@@ -423,6 +428,12 @@ s! {
     pub struct ptrace_thread_state {
         pub pts_tid: ::pid_t,
     }
+
+    // search.h
+    pub struct entry {
+        pub key: *mut ::c_char,
+        pub data: *mut ::c_void,
+    }
 }
 
 impl siginfo_t {
@@ -1471,6 +1482,10 @@ pub const PTRACE_FORK: ::c_int = 0x0002;
 
 pub const WCONTINUED: ::c_int = 8;
 
+// search.h
+pub const FIND: ::ACTION = 0;
+pub const ENTER: ::ACTION = 1;
+
 const_fn! {
     {const} fn _ALIGN(p: usize) -> usize {
         (p + _ALIGNBYTES) & !_ALIGNBYTES
@@ -1652,6 +1667,9 @@ extern "C" {
         width: ::size_t,
         compar: ::Option<unsafe extern "C" fn(*const ::c_void, *const ::c_void) -> ::c_int>,
     ) -> *mut ::c_void;
+    pub fn hcreate(nelt: ::size_t) -> ::c_int;
+    pub fn hdestroy();
+    pub fn hsearch(entry: ::ENTRY, action: ::ACTION) -> *mut ::ENTRY;
 }
 
 #[link(name = "execinfo")]

src/unix/haiku/mod.rs

@@ -33,14 +33,12 @@ pub type fd_mask = u32;
 
 pub type Elf32_Addr = u32;
 pub type Elf32_Half = u16;
-pub type Elf32_Lword = u64;
 pub type Elf32_Off = u32;
 pub type Elf32_Sword = i32;
 pub type Elf32_Word = u32;
 
 pub type Elf64_Addr = u64;
 pub type Elf64_Half = u16;
-pub type Elf64_Lword = u64;
 pub type Elf64_Off = u64;
 pub type Elf64_Sword = i32;
 pub type Elf64_Sxword = i64;
@@ -120,12 +118,12 @@ s! {
 
     pub struct ifaddrs {
         pub ifa_next: *mut ifaddrs,
-        pub ifa_name: *mut ::c_char,
+        pub ifa_name: *const ::c_char,
         pub ifa_flags: ::c_uint,
         pub ifa_addr: *mut ::sockaddr,
         pub ifa_netmask: *mut ::sockaddr,
         pub ifa_dstaddr: *mut ::sockaddr,
-        pub ida_data: *mut ::c_void,
+        pub ifa_data: *mut ::c_void,
     }
 
     pub struct fd_set {
@@ -1530,7 +1528,12 @@ extern "C" {
     ) -> ::c_int;
 
     pub fn getspent() -> *mut spwd;
-    pub fn getspent_r(pwd: *mut spwd, buf: *mut ::c_char, bufferSize: ::size_t) -> ::c_int;
+    pub fn getspent_r(
+        pwd: *mut spwd,
+        buf: *mut ::c_char,
+        bufferSize: ::size_t,
+        res: *mut *mut spwd,
+    ) -> ::c_int;
     pub fn setspent();
     pub fn endspent();
     pub fn getspnam(name: *const ::c_char) -> *mut spwd;

src/unix/haiku/native.rs

@@ -879,7 +879,7 @@ extern "C" {
     pub fn rename_thread(thread: thread_id, newName: *const ::c_char) -> status_t;
     pub fn set_thread_priority(thread: thread_id, newPriority: i32) -> status_t;
     pub fn suggest_thread_priority(
-        task_flags: be_task_flags,
+        what: u32,
         period: i32,
         jitter: ::bigtime_t,
         length: ::bigtime_t,
@@ -936,8 +936,6 @@ extern "C" {
     pub fn debugger(message: *const ::c_char);
     pub fn disable_debugger(state: ::c_int) -> ::c_int;
 
-    pub fn get_cpuid(info: *mut cpuid_info, eaxRegister: u32, cpuNum: u32) -> status_t;
-
     pub fn get_system_info(info: *mut system_info) -> status_t;
     pub fn get_cpu_info(firstCPU: u32, cpuCount: u32, info: *mut cpu_info) -> status_t;
     pub fn is_computer_on() -> i32;
@@ -1084,6 +1082,14 @@ extern "C" {
     ) -> status_t;
 }
 
+cfg_if! {
+    if #[cfg(libc_union)] {
+        extern "C" {
+            pub fn get_cpuid(info: *mut cpuid_info, eaxRegister: u32, cpuNum: u32) -> status_t;
+        }
+    }
+}
+
 // The following functions are defined as macros in C/C++
 pub unsafe fn get_area_info(id: area_id, info: *mut area_info) -> status_t {
     _get_area_info(id, info, core::mem::size_of::<area_info>() as usize)

src/unix/linux_like/linux/gnu/b32/arm/mod.rs

@@ -815,6 +815,7 @@ pub const SYS_pkey_mprotect: ::c_long = 394;
 pub const SYS_pkey_alloc: ::c_long = 395;
 pub const SYS_pkey_free: ::c_long = 396;
 pub const SYS_statx: ::c_long = 397;
+pub const SYS_rseq: ::c_long = 398;
 pub const SYS_pidfd_send_signal: ::c_long = 424;
 pub const SYS_io_uring_setup: ::c_long = 425;
 pub const SYS_io_uring_enter: ::c_long = 426;

src/unix/linux_like/linux/gnu/b32/mips/mod.rs

@@ -516,6 +516,7 @@ pub const SYS_pkey_mprotect: ::c_long = 4000 + 363;
 pub const SYS_pkey_alloc: ::c_long = 4000 + 364;
 pub const SYS_pkey_free: ::c_long = 4000 + 365;
 pub const SYS_statx: ::c_long = 4000 + 366;
+pub const SYS_rseq: ::c_long = 4000 + 367;
 pub const SYS_pidfd_send_signal: ::c_long = 4000 + 424;
 pub const SYS_io_uring_setup: ::c_long = 4000 + 425;
 pub const SYS_io_uring_enter: ::c_long = 4000 + 426;

src/unix/linux_like/linux/gnu/b32/powerpc.rs

@@ -794,6 +794,7 @@ 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 SYS_statx: ::c_long = 383;
+pub const SYS_rseq: ::c_long = 387;
 pub const SYS_pidfd_send_signal: ::c_long = 424;
 pub const SYS_io_uring_setup: ::c_long = 425;
 pub const SYS_io_uring_enter: ::c_long = 426;