Skip to content

Commit f9d508f

Browse files
bors[bot]rtzoeller
andauthored
Merge #1501 #1505
1501: Mark x86_64-unknown-illumos as Tier 2 r=asomers a=rtzoeller Illumos support is automatically built, but the README does not reflect this. 1505: Fix build for DragonFlyBSD r=asomers a=rtzoeller The build for DragonFlyBSD is currently failing, due to a missing field when initializing `passwd`. Fix warnings due to types being referenced which are marked as deprecated in libc. These constants are unused by DragonFlyBSD and can be removed: rust-lang/libc@e0d27d0 Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
3 parents f6d2e15 + b08d135 + 8366b92 commit f9d508f

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ Tier 2:
7474
* s390x-unknown-linux-gnu
7575
* x86_64-apple-ios
7676
* x86_64-linux-android
77+
* x86_64-unknown-illumos
7778
* x86_64-unknown-netbsd
7879

7980
Tier 3:

src/sys/mman.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ libc_bitflags!{
6565
MAP_LOCKED;
6666
/// Do not reserve swap space for this mapping.
6767
///
68-
/// This was removed in FreeBSD 11.
69-
#[cfg(not(target_os = "freebsd"))]
68+
/// This was removed in FreeBSD 11 and is unused in DragonFlyBSD.
69+
#[cfg(not(any(target_os = "dragonfly", target_os = "freebsd")))]
7070
MAP_NORESERVE;
7171
/// Populate page tables for a mapping.
7272
#[cfg(any(target_os = "android", target_os = "linux"))]
@@ -122,8 +122,8 @@ libc_bitflags!{
122122
MAP_NOSYNC;
123123
/// Rename private pages to a file.
124124
///
125-
/// This was removed in FreeBSD 11.
126-
#[cfg(any(target_os = "dragonfly", target_os = "netbsd", target_os = "openbsd"))]
125+
/// This was removed in FreeBSD 11 and is unused in DragonFlyBSD.
126+
#[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
127127
MAP_RENAME;
128128
/// Region may contain semaphores.
129129
#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]

src/unistd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2742,7 +2742,7 @@ impl From<User> for libc::passwd {
27422742
pw_age: CString::new("").unwrap().into_raw(),
27432743
#[cfg(target_os = "illumos")]
27442744
pw_comment: CString::new("").unwrap().into_raw(),
2745-
#[cfg(target_os = "freebsd")]
2745+
#[cfg(any(target_os = "dragonfly", target_os = "freebsd"))]
27462746
pw_fields: 0,
27472747
}
27482748
}

0 commit comments

Comments
 (0)