Skip to content

Commit 4a18571

Browse files
borsbors
committed
Auto merge of #2804 - JohnTitor:cleanup-freebsd-test, r=Amanieu
Remove workarounds for old FreeBSDs on libc-test Fixes #2546 This doesn't remove cfgs for old FreeBSDs as [it caused a regression in the past](#2585).
2 parents 23fbf1c + 446c6fb commit 4a18571

File tree

1 file changed

+4
-159
lines changed

1 file changed

+4
-159
lines changed

‎libc-test/build.rs‎

Lines changed: 4 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -1836,8 +1836,6 @@ fn test_freebsd(target: &str) {
18361836
let freebsd_ver = which_freebsd();
18371837

18381838
match freebsd_ver {
1839-
Some(10) => cfg.cfg("freebsd10", None),
1840-
Some(11) => cfg.cfg("freebsd11", None),
18411839
Some(12) => cfg.cfg("freebsd12", None),
18421840
Some(13) => cfg.cfg("freebsd13", None),
18431841
Some(14) => cfg.cfg("freebsd14", None),
@@ -1849,15 +1847,7 @@ fn test_freebsd(target: &str) {
18491847
// Required for `getline`:
18501848
cfg.define("_WITH_GETLINE", None);
18511849
// Required for making freebsd11_stat available in the headers
1852-
match freebsd_ver {
1853-
Some(10) => &mut cfg,
1854-
_ => cfg.define("_WANT_FREEBSD11_STAT", None),
1855-
};
1856-
1857-
let freebsd12 = match freebsd_ver {
1858-
Some(n) if n >= 12 => true,
1859-
_ => false,
1860-
};
1850+
cfg.define("_WANT_FREEBSD11_STAT", None);
18611851

18621852
let freebsd13 = match freebsd_ver {
18631853
Some(n) if n >= 13 => true,
@@ -1915,9 +1905,9 @@ fn test_freebsd(target: &str) {
19151905
"stdlib.h",
19161906
"string.h",
19171907
"sys/capsicum.h",
1918-
[freebsd12]:"sys/auxv.h",
1908+
"sys/auxv.h",
19191909
"sys/cpuset.h",
1920-
[freebsd12]:"sys/domainset.h",
1910+
"sys/domainset.h",
19211911
"sys/event.h",
19221912
[freebsd13]:"sys/eventfd.h",
19231913
"sys/extattr.h",
@@ -2033,54 +2023,10 @@ fn test_freebsd(target: &str) {
20332023
// These constants were introduced in FreeBSD 13:
20342024
"EFD_CLOEXEC" | "EFD_NONBLOCK" | "EFD_SEMAPHORE" if Some(13) > freebsd_ver => true,
20352025

2036-
// These constants were introduced in FreeBSD 12:
2037-
"SF_USER_READAHEAD"
2038-
| "EVFILT_EMPTY"
2039-
| "SO_REUSEPORT_LB"
2040-
| "IP_ORIGDSTADDR"
2041-
| "IP_RECVORIGDSTADDR"
2042-
| "IPV6_ORIGDSTADDR"
2043-
| "IPV6_RECVORIGDSTADDR"
2044-
| "NI_NUMERICSCOPE"
2045-
| "SO_DOMAIN"
2046-
if Some(11) == freebsd_ver =>
2047-
{
2048-
true
2049-
}
2050-
2051-
// These constants were introduced in FreeBSD 11:
2052-
"SF_USER_READAHEAD"
2053-
| "SF_NOCACHE"
2054-
| "RLIMIT_KQUEUES"
2055-
| "RLIMIT_UMTXP"
2056-
| "EVFILT_PROCDESC"
2057-
| "EVFILT_SENDFILE"
2058-
| "EVFILT_EMPTY"
2059-
| "SO_REUSEPORT_LB"
2060-
| "TCP_CCALGOOPT"
2061-
| "TCP_PCAP_OUT"
2062-
| "TCP_PCAP_IN"
2063-
| "IP_BINDMULTI"
2064-
| "IP_ORIGDSTADDR"
2065-
| "IP_RECVORIGDSTADDR"
2066-
| "IPV6_ORIGDSTADDR"
2067-
| "IPV6_RECVORIGDSTADDR"
2068-
| "PD_CLOEXEC"
2069-
| "PD_ALLOWED_AT_FORK"
2070-
| "IP_RSS_LISTEN_BUCKET"
2071-
| "NI_NUMERICSCOPE"
2072-
if Some(10) == freebsd_ver =>
2073-
{
2074-
true
2075-
}
2076-
2077-
// FIXME: This constant has a different value in FreeBSD 10:
2078-
"RLIM_NLIMITS" if Some(10) == freebsd_ver => true,
2079-
20802026
// FIXME: There are deprecated - remove in a couple of releases.
20812027
// These constants were removed in FreeBSD 11 (svn r273250) but will
20822028
// still be accepted and ignored at runtime.
2083-
"MAP_RENAME" | "MAP_NORESERVE" if Some(10) != freebsd_ver => true,
2029+
"MAP_RENAME" | "MAP_NORESERVE" => true,
20842030

20852031
// FIXME: There are deprecated - remove in a couple of releases.
20862032
// These constants were removed in FreeBSD 11 (svn r262489),
@@ -2095,16 +2041,6 @@ fn test_freebsd(target: &str) {
20952041
// This was renamed in FreeBSD 12.2 and 13 (r352486).
20962042
"CTL_UNSPEC" | "CTL_SYSCTL" => true,
20972043

2098-
// These were added in FreeBSD 12.2 and 13 (r352486),
2099-
// but they are just names for magic numbers that existed for ages.
2100-
"CTL_SYSCTL_DEBUG"
2101-
| "CTL_SYSCTL_NAME"
2102-
| "CTL_SYSCTL_NEXT"
2103-
| "CTL_SYSCTL_NAME2OID"
2104-
| "CTL_SYSCTL_OIDFMT"
2105-
| "CTL_SYSCTL_OIDDESCR"
2106-
| "CTL_SYSCTL_OIDLABEL" => true,
2107-
21082044
// This was renamed in FreeBSD 12.2 and 13 (r350749).
21092045
"IPPROTO_SEP" | "IPPROTO_DCCP" => true,
21102046

@@ -2113,34 +2049,9 @@ fn test_freebsd(target: &str) {
21132049
// commit/06b00ceaa914a3907e4e27bad924f44612bae1d7
21142050
"MINCORE_SUPER" if Some(13) <= freebsd_ver => true,
21152051

2116-
// Added in FreeBSD 12.0
2117-
"EINTEGRITY" if Some(11) == freebsd_ver => true,
2118-
2119-
// This was increased to 97 in FreeBSD 12.2 and 13.
2120-
// https://github.com/freebsd/freebsd/
2121-
// commit/72a21ba0f62da5e86a1c0b462aeb3f5ff849a1b7
2122-
"ELAST" if Some(12) == freebsd_ver => true,
2123-
2124-
// Added in FreeBSD 12.0 (r331279)
2125-
"GRND_NONBLOCK" | "GRND_RANDOM" if Some(11) == freebsd_ver => true,
21262052
// Added in FreeBSD 13.0 (r356667)
21272053
"GRND_INSECURE" if Some(13) > freebsd_ver => true,
21282054

2129-
// Added in FreeBSD 12.1 (r343964)
2130-
"PROC_ASLR_CTL"
2131-
| "PROC_ASLR_STATUS"
2132-
| "PROC_ASLR_FORCE_ENABLE"
2133-
| "PROC_ASLR_FORCE_DISABLE"
2134-
| "PROC_ASLR_NOFORCE"
2135-
| "PROC_ASLR_ACTIVE"
2136-
if Some(11) == freebsd_ver =>
2137-
{
2138-
true
2139-
}
2140-
2141-
// Added in FreeBSD 12.1 (r345228)
2142-
"PROC_PROCCTL_MD_MIN" if Some(11) == freebsd_ver => true,
2143-
21442055
// Added in FreeBSD 13.0 (r349609)
21452056
"PROC_PROTMAX_CTL"
21462057
| "PROC_PROTMAX_STATUS"
@@ -2153,17 +2064,12 @@ fn test_freebsd(target: &str) {
21532064
true
21542065
}
21552066

2156-
// Added in FreeBSD 12.1
2157-
"PT_GET_SC_RET" | "PT_GET_SC_ARGS" if Some(11) == freebsd_ver => true,
2158-
21592067
// Added in in FreeBSD 13.0 (r367776 and r367287)
21602068
"SCM_CREDS2" | "LOCAL_CREDS_PERSISTENT" if Some(13) > freebsd_ver => true,
21612069

21622070
// Added in FreeBSD 14
21632071
"SPACECTL_DEALLOC" if Some(14) > freebsd_ver => true,
21642072

2165-
"VM_TOTAL" if Some(11) == freebsd_ver => true,
2166-
21672073
// Added in FreeBSD 13.
21682074
"KERN_PROC_SIGFASTBLK"
21692075
| "USER_LOCALBASE"
@@ -2179,18 +2085,6 @@ fn test_freebsd(target: &str) {
21792085
{
21802086
true
21812087
}
2182-
// Added in FreeBSD 12.
2183-
"KERN_MAXPHYS"
2184-
| "KVME_FLAG_USER_WIRED"
2185-
| "TDP2_SBPAGES"
2186-
| "P2_ASLR_ENABLE"
2187-
| "P2_ASLR_DISABLE"
2188-
| "P2_ASLR_IGNSTART"
2189-
| "P_TREE_GRPEXITED"
2190-
if Some(12) > freebsd_ver =>
2191-
{
2192-
true
2193-
}
21942088

21952089
// Added in freebsd 14.
21962090
"IFCAP_MEXTPG" if Some(14) > freebsd_ver => true,
@@ -2201,8 +2095,6 @@ fn test_freebsd(target: &str) {
22012095
{
22022096
true
22032097
}
2204-
// Added in freebsd 12.
2205-
"IFF_NOGROUP" | "IFCAP_TXRTLMT" | "IFCAP_HWRXTSTMP" if Some(12) > freebsd_ver => true,
22062098
// Added in FreeBSD 13.
22072099
"PS_FST_TYPE_EVENTFD" if Some(13) > freebsd_ver => true,
22082100

@@ -2217,9 +2109,6 @@ fn test_freebsd(target: &str) {
22172109
true
22182110
}
22192111

2220-
// Added in FreeBSD 12.
2221-
"MNT_UNTRUSTED" | "MNT_VERIFIED" if Some(12) > freebsd_ver => true,
2222-
22232112
// Added in FreeBSD 14.
22242113
"PT_COREDUMP" | "PC_ALL" | "PC_COMPRESS" | "PT_GETREGSET" | "PT_SETREGSET"
22252114
if Some(14) > freebsd_ver =>
@@ -2242,9 +2131,6 @@ fn test_freebsd(target: &str) {
22422131
true
22432132
}
22442133

2245-
// Those were introduced in FreeBSD 12.
2246-
"TCP_FUNCTION_NAME_LEN_MAX" | "TCP_FASTOPEN_PSK_LEN" if Some(11) == freebsd_ver => true,
2247-
22482134
// Flags introduced in FreeBSD 14.
22492135
"TCP_MAXUNACKTIME"
22502136
| "TCP_MAXPEAKRATE"
@@ -2285,35 +2171,18 @@ fn test_freebsd(target: &str) {
22852171
return true;
22862172
}
22872173
match ty {
2288-
// `mmsghdr` is not available in FreeBSD 10
2289-
"mmsghdr" if Some(10) == freebsd_ver => true,
2290-
2291-
// `max_align_t` is not available in FreeBSD 10
2292-
"max_align_t" if Some(10) == freebsd_ver => true,
2293-
22942174
// `procstat` is a private struct
22952175
"procstat" => true,
22962176

2297-
// `ptrace_sc_ret` is not available in FreeBSD 11
2298-
"ptrace_sc_ret" if Some(11) == freebsd_ver => true,
2299-
23002177
// `spacectl_range` was introduced in FreeBSD 14
23012178
"spacectl_range" if Some(14) > freebsd_ver => true,
23022179

2303-
// obsolete version
2304-
"vmtotal" if Some(11) == freebsd_ver => true,
2305-
23062180
// `ptrace_coredump` introduced in FreeBSD 14.
23072181
"ptrace_coredump" if Some(14) > freebsd_ver => true,
23082182

23092183
// `sockcred2` is not available in FreeBSD 12.
23102184
"sockcred2" if Some(13) > freebsd_ver => true,
23112185

2312-
// `tcp_fastopen` introduced in FreeBSD 12.
2313-
"tcp_fastopen" if Some(11) == freebsd_ver => true,
2314-
// `tcp_function_set` introduced in FreeBSD 12.
2315-
"tcp_function_set" if Some(11) == freebsd_ver => true,
2316-
23172186
_ => false,
23182187
}
23192188
});
@@ -2324,15 +2193,6 @@ fn test_freebsd(target: &str) {
23242193
// FIXME: https://github.com/rust-lang/libc/issues/1272
23252194
"execv" | "execve" | "execvp" | "execvpe" | "fexecve" => true,
23262195

2327-
// These functions were added in FreeBSD 11:
2328-
"fdatasync" | "mq_getfd_np" | "sendmmsg" | "recvmmsg" if Some(10) == freebsd_ver => {
2329-
true
2330-
}
2331-
2332-
// This function changed its return type from `int` in FreeBSD10 to
2333-
// `ssize_t` in FreeBSD11:
2334-
"aio_waitcomplete" if Some(10) == freebsd_ver => true,
2335-
23362196
// `fspacectl` was introduced in FreeBSD 14
23372197
"fspacectl" if Some(14) > freebsd_ver => true,
23382198

@@ -2362,9 +2222,6 @@ fn test_freebsd(target: &str) {
23622222
true
23632223
}
23642224

2365-
// Those were introduced in FreeBSD 12.
2366-
"flopen" | "flopenat" if Some(12) > freebsd_ver => true,
2367-
23682225
// Added in FreeBSD 13.
23692226
"getlocalbase" if Some(13) > freebsd_ver => true,
23702227
"aio_readv" if Some(13) > freebsd_ver => true,
@@ -2374,14 +2231,6 @@ fn test_freebsd(target: &str) {
23742231
}
23752232
});
23762233

2377-
cfg.skip_signededness(move |c| {
2378-
match c {
2379-
// FIXME: has a different sign in FreeBSD10
2380-
"blksize_t" if Some(10) == freebsd_ver => true,
2381-
_ => false,
2382-
}
2383-
});
2384-
23852234
cfg.volatile_item(|i| {
23862235
use ctest::VolatileItemKind::*;
23872236
match i {
@@ -2398,10 +2247,6 @@ fn test_freebsd(target: &str) {
23982247
// incorrect, see: https://github.com/rust-lang/libc/issues/1359
23992248
("sigaction", "sa_sigaction") => true,
24002249

2401-
// FIXME: in FreeBSD10 this field has type `char*` instead of
2402-
// `void*`:
2403-
("stack_t", "ss_sp") if Some(10) == freebsd_ver => true,
2404-
24052250
// conflicting with `p_type` macro from <resolve.h>.
24062251
("Elf32_Phdr", "p_type") => true,
24072252
("Elf64_Phdr", "p_type") => true,

0 commit comments

Comments
 (0)