diff --git a/libc-test/build.rs b/libc-test/build.rs index 90ebea1a..3f1964d6 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -1836,8 +1836,6 @@ fn test_freebsd(target: &str) { let freebsd_ver = which_freebsd(); match freebsd_ver { - Some(10) => cfg.cfg("freebsd10", None), - Some(11) => cfg.cfg("freebsd11", None), Some(12) => cfg.cfg("freebsd12", None), Some(13) => cfg.cfg("freebsd13", None), Some(14) => cfg.cfg("freebsd14", None), @@ -1849,15 +1847,7 @@ fn test_freebsd(target: &str) { // Required for `getline`: cfg.define("_WITH_GETLINE", None); // Required for making freebsd11_stat available in the headers - match freebsd_ver { - Some(10) => &mut cfg, - _ => cfg.define("_WANT_FREEBSD11_STAT", None), - }; - - let freebsd12 = match freebsd_ver { - Some(n) if n >= 12 => true, - _ => false, - }; + cfg.define("_WANT_FREEBSD11_STAT", None); let freebsd13 = match freebsd_ver { Some(n) if n >= 13 => true, @@ -1915,9 +1905,9 @@ fn test_freebsd(target: &str) { "stdlib.h", "string.h", "sys/capsicum.h", - [freebsd12]:"sys/auxv.h", + "sys/auxv.h", "sys/cpuset.h", - [freebsd12]:"sys/domainset.h", + "sys/domainset.h", "sys/event.h", [freebsd13]:"sys/eventfd.h", "sys/extattr.h", @@ -2033,54 +2023,10 @@ fn test_freebsd(target: &str) { // These constants were introduced in FreeBSD 13: "EFD_CLOEXEC" | "EFD_NONBLOCK" | "EFD_SEMAPHORE" if Some(13) > freebsd_ver => true, - // These constants were introduced in FreeBSD 12: - "SF_USER_READAHEAD" - | "EVFILT_EMPTY" - | "SO_REUSEPORT_LB" - | "IP_ORIGDSTADDR" - | "IP_RECVORIGDSTADDR" - | "IPV6_ORIGDSTADDR" - | "IPV6_RECVORIGDSTADDR" - | "NI_NUMERICSCOPE" - | "SO_DOMAIN" - if Some(11) == freebsd_ver => - { - true - } - - // These constants were introduced in FreeBSD 11: - "SF_USER_READAHEAD" - | "SF_NOCACHE" - | "RLIMIT_KQUEUES" - | "RLIMIT_UMTXP" - | "EVFILT_PROCDESC" - | "EVFILT_SENDFILE" - | "EVFILT_EMPTY" - | "SO_REUSEPORT_LB" - | "TCP_CCALGOOPT" - | "TCP_PCAP_OUT" - | "TCP_PCAP_IN" - | "IP_BINDMULTI" - | "IP_ORIGDSTADDR" - | "IP_RECVORIGDSTADDR" - | "IPV6_ORIGDSTADDR" - | "IPV6_RECVORIGDSTADDR" - | "PD_CLOEXEC" - | "PD_ALLOWED_AT_FORK" - | "IP_RSS_LISTEN_BUCKET" - | "NI_NUMERICSCOPE" - if Some(10) == freebsd_ver => - { - true - } - - // FIXME: This constant has a different value in FreeBSD 10: - "RLIM_NLIMITS" if Some(10) == freebsd_ver => true, - // FIXME: There are deprecated - remove in a couple of releases. // These constants were removed in FreeBSD 11 (svn r273250) but will // still be accepted and ignored at runtime. - "MAP_RENAME" | "MAP_NORESERVE" if Some(10) != freebsd_ver => true, + "MAP_RENAME" | "MAP_NORESERVE" => true, // FIXME: There are deprecated - remove in a couple of releases. // These constants were removed in FreeBSD 11 (svn r262489), @@ -2095,16 +2041,6 @@ fn test_freebsd(target: &str) { // This was renamed in FreeBSD 12.2 and 13 (r352486). "CTL_UNSPEC" | "CTL_SYSCTL" => true, - // These were added in FreeBSD 12.2 and 13 (r352486), - // but they are just names for magic numbers that existed for ages. - "CTL_SYSCTL_DEBUG" - | "CTL_SYSCTL_NAME" - | "CTL_SYSCTL_NEXT" - | "CTL_SYSCTL_NAME2OID" - | "CTL_SYSCTL_OIDFMT" - | "CTL_SYSCTL_OIDDESCR" - | "CTL_SYSCTL_OIDLABEL" => true, - // This was renamed in FreeBSD 12.2 and 13 (r350749). "IPPROTO_SEP" | "IPPROTO_DCCP" => true, @@ -2113,34 +2049,9 @@ fn test_freebsd(target: &str) { // commit/06b00ceaa914a3907e4e27bad924f44612bae1d7 "MINCORE_SUPER" if Some(13) <= freebsd_ver => true, - // Added in FreeBSD 12.0 - "EINTEGRITY" if Some(11) == freebsd_ver => true, - - // This was increased to 97 in FreeBSD 12.2 and 13. - // https://github.com/freebsd/freebsd/ - // commit/72a21ba0f62da5e86a1c0b462aeb3f5ff849a1b7 - "ELAST" if Some(12) == freebsd_ver => true, - - // Added in FreeBSD 12.0 (r331279) - "GRND_NONBLOCK" | "GRND_RANDOM" if Some(11) == freebsd_ver => true, // Added in FreeBSD 13.0 (r356667) "GRND_INSECURE" if Some(13) > freebsd_ver => true, - // Added in FreeBSD 12.1 (r343964) - "PROC_ASLR_CTL" - | "PROC_ASLR_STATUS" - | "PROC_ASLR_FORCE_ENABLE" - | "PROC_ASLR_FORCE_DISABLE" - | "PROC_ASLR_NOFORCE" - | "PROC_ASLR_ACTIVE" - if Some(11) == freebsd_ver => - { - true - } - - // Added in FreeBSD 12.1 (r345228) - "PROC_PROCCTL_MD_MIN" if Some(11) == freebsd_ver => true, - // Added in FreeBSD 13.0 (r349609) "PROC_PROTMAX_CTL" | "PROC_PROTMAX_STATUS" @@ -2153,17 +2064,12 @@ fn test_freebsd(target: &str) { true } - // Added in FreeBSD 12.1 - "PT_GET_SC_RET" | "PT_GET_SC_ARGS" if Some(11) == freebsd_ver => true, - // Added in in FreeBSD 13.0 (r367776 and r367287) "SCM_CREDS2" | "LOCAL_CREDS_PERSISTENT" if Some(13) > freebsd_ver => true, // Added in FreeBSD 14 "SPACECTL_DEALLOC" if Some(14) > freebsd_ver => true, - "VM_TOTAL" if Some(11) == freebsd_ver => true, - // Added in FreeBSD 13. "KERN_PROC_SIGFASTBLK" | "USER_LOCALBASE" @@ -2179,18 +2085,6 @@ fn test_freebsd(target: &str) { { true } - // Added in FreeBSD 12. - "KERN_MAXPHYS" - | "KVME_FLAG_USER_WIRED" - | "TDP2_SBPAGES" - | "P2_ASLR_ENABLE" - | "P2_ASLR_DISABLE" - | "P2_ASLR_IGNSTART" - | "P_TREE_GRPEXITED" - if Some(12) > freebsd_ver => - { - true - } // Added in freebsd 14. "IFCAP_MEXTPG" if Some(14) > freebsd_ver => true, @@ -2201,8 +2095,6 @@ fn test_freebsd(target: &str) { { true } - // Added in freebsd 12. - "IFF_NOGROUP" | "IFCAP_TXRTLMT" | "IFCAP_HWRXTSTMP" if Some(12) > freebsd_ver => true, // Added in FreeBSD 13. "PS_FST_TYPE_EVENTFD" if Some(13) > freebsd_ver => true, @@ -2217,9 +2109,6 @@ fn test_freebsd(target: &str) { true } - // Added in FreeBSD 12. - "MNT_UNTRUSTED" | "MNT_VERIFIED" if Some(12) > freebsd_ver => true, - // Added in FreeBSD 14. "PT_COREDUMP" | "PC_ALL" | "PC_COMPRESS" | "PT_GETREGSET" | "PT_SETREGSET" if Some(14) > freebsd_ver => @@ -2242,9 +2131,6 @@ fn test_freebsd(target: &str) { true } - // Those were introduced in FreeBSD 12. - "TCP_FUNCTION_NAME_LEN_MAX" | "TCP_FASTOPEN_PSK_LEN" if Some(11) == freebsd_ver => true, - // Flags introduced in FreeBSD 14. "TCP_MAXUNACKTIME" | "TCP_MAXPEAKRATE" @@ -2285,35 +2171,18 @@ fn test_freebsd(target: &str) { return true; } match ty { - // `mmsghdr` is not available in FreeBSD 10 - "mmsghdr" if Some(10) == freebsd_ver => true, - - // `max_align_t` is not available in FreeBSD 10 - "max_align_t" if Some(10) == freebsd_ver => true, - // `procstat` is a private struct "procstat" => true, - // `ptrace_sc_ret` is not available in FreeBSD 11 - "ptrace_sc_ret" if Some(11) == freebsd_ver => true, - // `spacectl_range` was introduced in FreeBSD 14 "spacectl_range" if Some(14) > freebsd_ver => true, - // obsolete version - "vmtotal" if Some(11) == freebsd_ver => true, - // `ptrace_coredump` introduced in FreeBSD 14. "ptrace_coredump" if Some(14) > freebsd_ver => true, // `sockcred2` is not available in FreeBSD 12. "sockcred2" if Some(13) > freebsd_ver => true, - // `tcp_fastopen` introduced in FreeBSD 12. - "tcp_fastopen" if Some(11) == freebsd_ver => true, - // `tcp_function_set` introduced in FreeBSD 12. - "tcp_function_set" if Some(11) == freebsd_ver => true, - _ => false, } }); @@ -2324,15 +2193,6 @@ fn test_freebsd(target: &str) { // FIXME: https://github.com/rust-lang/libc/issues/1272 "execv" | "execve" | "execvp" | "execvpe" | "fexecve" => true, - // These functions were added in FreeBSD 11: - "fdatasync" | "mq_getfd_np" | "sendmmsg" | "recvmmsg" if Some(10) == freebsd_ver => { - true - } - - // This function changed its return type from `int` in FreeBSD10 to - // `ssize_t` in FreeBSD11: - "aio_waitcomplete" if Some(10) == freebsd_ver => true, - // `fspacectl` was introduced in FreeBSD 14 "fspacectl" if Some(14) > freebsd_ver => true, @@ -2362,9 +2222,6 @@ fn test_freebsd(target: &str) { true } - // Those were introduced in FreeBSD 12. - "flopen" | "flopenat" if Some(12) > freebsd_ver => true, - // Added in FreeBSD 13. "getlocalbase" if Some(13) > freebsd_ver => true, "aio_readv" if Some(13) > freebsd_ver => true, @@ -2374,14 +2231,6 @@ fn test_freebsd(target: &str) { } }); - cfg.skip_signededness(move |c| { - match c { - // FIXME: has a different sign in FreeBSD10 - "blksize_t" if Some(10) == freebsd_ver => true, - _ => false, - } - }); - cfg.volatile_item(|i| { use ctest::VolatileItemKind::*; match i { @@ -2398,10 +2247,6 @@ fn test_freebsd(target: &str) { // incorrect, see: https://github.com/rust-lang/libc/issues/1359 ("sigaction", "sa_sigaction") => true, - // FIXME: in FreeBSD10 this field has type `char*` instead of - // `void*`: - ("stack_t", "ss_sp") if Some(10) == freebsd_ver => true, - // conflicting with `p_type` macro from . ("Elf32_Phdr", "p_type") => true, ("Elf64_Phdr", "p_type") => true,