Skip to content

Commit 84ff852

Browse files
committed
style: fix DragonFly CI checks
1 parent a315423 commit 84ff852

2 files changed

Lines changed: 38 additions & 15 deletions

File tree

libc-test/build.rs

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,9 +1505,7 @@ fn test_netbsd(target: &str) {
15051505
fn test_dragonflybsd(target: &str) {
15061506
assert!(target.contains("dragonfly"));
15071507
let mut cfg = ctest_cfg();
1508-
cfg.flag("-Wno-deprecated-declarations")
1509-
.flag_if_supported("-Wno-address-of-packed-member")
1510-
.flag_if_supported("-Wno-unknown-warning-option");
1508+
cfg.flag("-Wno-deprecated-declarations");
15111509

15121510
let dragonfly_version = if let Ok(version) = env::var("RUST_LIBC_UNSTABLE_DRAGONFLY_VERSION") {
15131511
let vers = parse_dragonfly_version(&version).unwrap();
@@ -1694,11 +1692,24 @@ fn test_dragonflybsd(target: &str) {
16941692
| "DTYPE_CRYPTO" | "DTYPE_MQUEUE" | "DTYPE_DMABUF" => true,
16951693

16961694
// Not exposed by current DragonFly userland headers.
1697-
"REG_DUMP" | "REG_ASSERT" | "REG_ATOI" | "REG_ITOA" | "REG_TRACE" | "REG_LARGE"
1698-
| "IP_ADD_SOURCE_MEMBERSHIP" | "IP_DROP_SOURCE_MEMBERSHIP" | "IP_BLOCK_SOURCE"
1699-
| "IP_UNBLOCK_SOURCE" | "MAP_RENAME" | "MAP_NORESERVE" | "CTL_UNSPEC"
1700-
| "KERN_PROF" | "CTL_P1003_1B_UNUSED1" | "CTL_P1003_1B_SEM_VALUE_MAX"
1701-
| "DOWNTIME" | "SF_CACHE" => true,
1695+
"REG_DUMP"
1696+
| "REG_ASSERT"
1697+
| "REG_ATOI"
1698+
| "REG_ITOA"
1699+
| "REG_TRACE"
1700+
| "REG_LARGE"
1701+
| "IP_ADD_SOURCE_MEMBERSHIP"
1702+
| "IP_DROP_SOURCE_MEMBERSHIP"
1703+
| "IP_BLOCK_SOURCE"
1704+
| "IP_UNBLOCK_SOURCE"
1705+
| "MAP_RENAME"
1706+
| "MAP_NORESERVE"
1707+
| "CTL_UNSPEC"
1708+
| "KERN_PROF"
1709+
| "CTL_P1003_1B_UNUSED1"
1710+
| "CTL_P1003_1B_SEM_VALUE_MAX"
1711+
| "DOWNTIME"
1712+
| "SF_CACHE" => true,
17021713

17031714
// libc exposes the 6.0-compatible value for this version-dependent mask.
17041715
"KERN_PROC_FLAGMASK" => true,
@@ -1707,9 +1718,21 @@ fn test_dragonflybsd(target: &str) {
17071718
"CPUCTL_RSMSR" | "UTX_DB_LASTLOG" => true,
17081719

17091720
// Introduced after DragonFly 5.8.
1710-
"AF_ARP" | "PF_ARP" | "IP_SENDSRCADDR" | "F_GETPATH" | "ENOTRECOVERABLE" | "EOWNERDEAD"
1711-
| "SO_PASSCRED" | "PROC_PDEATHSIG_CTL" | "PROC_PDEATHSIG_STATUS"
1712-
| "KERN_STATIC_TLS_EXTRA" | "KERN_MAXID" if dragonfly_version < 600_000 => true,
1721+
"AF_ARP"
1722+
| "PF_ARP"
1723+
| "IP_SENDSRCADDR"
1724+
| "F_GETPATH"
1725+
| "ENOTRECOVERABLE"
1726+
| "EOWNERDEAD"
1727+
| "SO_PASSCRED"
1728+
| "PROC_PDEATHSIG_CTL"
1729+
| "PROC_PDEATHSIG_STATUS"
1730+
| "KERN_STATIC_TLS_EXTRA"
1731+
| "KERN_MAXID"
1732+
if dragonfly_version < 600_000 =>
1733+
{
1734+
true
1735+
}
17131736

17141737
// weird signed extension or something like that?
17151738
"MS_NOUSER" => true,

libc-test/semver/dragonfly.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -286,11 +286,11 @@ EV_ONESHOT
286286
EV_RECEIPT
287287
EV_SYSFLAGS
288288
EXTA
289-
EXTB
290-
EXTPROC
291289
EXTATTR_NAMESPACE_EMPTY
292290
EXTATTR_NAMESPACE_SYSTEM
293291
EXTATTR_NAMESPACE_USER
292+
EXTB
293+
EXTPROC
294294
Elf32_Addr
295295
Elf32_Half
296296
Elf32_Lword
@@ -1451,8 +1451,8 @@ initgroups
14511451
ipc_perm
14521452
issetugid
14531453
jrand48
1454-
key_t
14551454
kevent
1455+
key_t
14561456
killpg
14571457
kinfo_cputime
14581458
kinfo_file
@@ -1657,9 +1657,9 @@ setutxent
16571657
sf_hdtr
16581658
shmat
16591659
shmctl
1660-
shmid_ds
16611660
shmdt
16621661
shmget
1662+
shmid_ds
16631663
sigaltstack
16641664
sigevent
16651665
siginfo_t

0 commit comments

Comments
 (0)