Remove removed items in OpenBSD

Author: JohnTitor

libc-test/build.rs

@@ -523,10 +523,6 @@ fn test_openbsd(target: &str) {
 
     cfg.skip_const(move |name| {
         match name {
-            // Removed in OpenBSD 6.0
-            "KERN_USERMOUNT" | "KERN_ARND" => true,
-            // Removed in OpenBSD 7.2
-            "KERN_NSELCOLL" => true,
             // Good chance it's going to be wrong depending on the host release
             "KERN_MAXID" | "NET_RT_MAXID" => true,
             "EV_SYSFLAGS" => true,
@@ -539,20 +535,12 @@ fn test_openbsd(target: &str) {
             // FIXME: https://github.com/rust-lang/libc/issues/1272
             "execv" | "execve" | "execvp" | "execvpe" => true,
 
-            // Removed in OpenBSD 6.5
-            // https://marc.info/?l=openbsd-cvs&m=154723400730318
-            "mincore" => true,
-
             // futex() has volatile arguments, but that doesn't exist in Rust.
             "futex" => true,
 
             // Available for openBSD 7.3
             "mimmutable" => true,
 
-            // Removed in OpenBSD 7.5
-            // https://marc.info/?l=openbsd-cvs&m=170239504300386
-            "syscall" => true,
-
             _ => false,
         }
     });

libc-test/semver/openbsd.txt

@@ -331,7 +331,6 @@ ITIMER_PROF
 ITIMER_REAL
 ITIMER_VIRTUAL
 KERN_ARGMAX
-KERN_ARND
 KERN_AUDIO
 KERN_BOOTTIME
 KERN_CACHEPCT
@@ -372,7 +371,6 @@ KERN_NFILES
 KERN_NGROUPS
 KERN_NOSUIDCOREDUMP
 KERN_NPROCS
-KERN_NSELCOLL
 KERN_NTHREADS
 KERN_NUMVNODES
 KERN_OSRELEASE
@@ -422,7 +420,6 @@ KERN_TIMECOUNTER
 KERN_TIMEOUT_STATS
 KERN_TTY
 KERN_TTYCOUNT
-KERN_USERMOUNT
 KERN_VERSION
 KERN_WATCHDOG
 KVE_ADV_NORMAL
@@ -1129,7 +1126,6 @@ memmem
 memrchr
 mfs_args
 mimmutable
-mincore
 mkdirat
 mkfifoat
 mknodat
@@ -1279,7 +1275,6 @@ strndup
 strsignal
 strtonum
 sync
-syscall
 sysctl
 tcp_info
 telldir

src/unix/bsd/mod.rs

@@ -632,7 +632,6 @@ extern "C" {
     pub fn ioctl(fd: ::c_int, request: ::c_ulong, ...) -> ::c_int;
     pub fn kqueue() -> ::c_int;
     pub fn unmount(target: *const ::c_char, arg: ::c_int) -> ::c_int;
-    pub fn syscall(num: ::c_int, ...) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__getpwent50")]
     pub fn getpwent() -> *mut passwd;
     pub fn setpwent();
@@ -916,6 +915,14 @@ extern "C" {
     ) -> ::size_t;
 }
 
+cfg_if! {
+    if #[cfg(not(target_os = "openbsd"))] {
+        extern "C" {
+            pub fn syscall(num: ::c_int, ...) -> ::c_int;
+        }
+    }
+}
+
 cfg_if! {
     if #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos"))] {
         mod apple;

src/unix/bsd/netbsdlike/mod.rs

@@ -672,7 +672,6 @@ extern "C" {
         addrlen: *mut ::socklen_t,
         flags: ::c_int,
     ) -> ::c_int;
-    pub fn mincore(addr: *mut ::c_void, len: ::size_t, vec: *mut ::c_char) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__clock_getres50")]
     pub fn clock_getres(clk_id: ::clockid_t, tp: *mut ::timespec) -> ::c_int;
     #[cfg_attr(target_os = "netbsd", link_name = "__clock_gettime50")]

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

@@ -2902,6 +2902,8 @@ extern "C" {
         result: *mut *mut ::group,
     ) -> ::c_int;
 
+    pub fn mincore(addr: *mut ::c_void, len: ::size_t, vec: *mut ::c_char) -> ::c_int;
+
     pub fn updwtmpx(file: *const ::c_char, ut: *const utmpx) -> ::c_int;
     pub fn getlastlogx(fname: *const ::c_char, uid: ::uid_t, ll: *mut lastlogx) -> *mut lastlogx;
     pub fn updlastlogx(fname: *const ::c_char, uid: ::uid_t, ll: *mut lastlogx) -> ::c_int;

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

@@ -1554,21 +1554,16 @@ pub const KERN_NTHREADS: ::c_int = 26;
 pub const KERN_OSVERSION: ::c_int = 27;
 pub const KERN_SOMAXCONN: ::c_int = 28;
 pub const KERN_SOMINCONN: ::c_int = 29;
-#[deprecated(since = "0.2.71", note = "Removed in OpenBSD 6.0")]
-pub const KERN_USERMOUNT: ::c_int = 30;
 pub const KERN_NOSUIDCOREDUMP: ::c_int = 32;
 pub const KERN_FSYNC: ::c_int = 33;
 pub const KERN_SYSVMSG: ::c_int = 34;
 pub const KERN_SYSVSEM: ::c_int = 35;
 pub const KERN_SYSVSHM: ::c_int = 36;
-#[deprecated(since = "0.2.71", note = "Removed in OpenBSD 6.0")]
-pub const KERN_ARND: ::c_int = 37;
 pub const KERN_MSGBUFSIZE: ::c_int = 38;
 pub const KERN_MALLOCSTATS: ::c_int = 39;
 pub const KERN_CPTIME: ::c_int = 40;
 pub const KERN_NCHSTATS: ::c_int = 41;
 pub const KERN_FORKSTAT: ::c_int = 42;
-pub const KERN_NSELCOLL: ::c_int = 43;
 pub const KERN_TTY: ::c_int = 44;
 pub const KERN_CCPU: ::c_int = 45;
 pub const KERN_FSCALE: ::c_int = 46;