Skip to content

Commit

Permalink
Merge #1501 #1505
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bors[bot] and rtzoeller committed Aug 27, 2021
3 parents f6d2e15 + b08d135 + 8366b92 commit f9d508f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Tier 2:
* s390x-unknown-linux-gnu
* x86_64-apple-ios
* x86_64-linux-android
* x86_64-unknown-illumos
* x86_64-unknown-netbsd

Tier 3:
Expand Down
8 changes: 4 additions & 4 deletions src/sys/mman.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ libc_bitflags!{
MAP_LOCKED;
/// Do not reserve swap space for this mapping.
///
/// This was removed in FreeBSD 11.
#[cfg(not(target_os = "freebsd"))]
/// This was removed in FreeBSD 11 and is unused in DragonFlyBSD.
#[cfg(not(any(target_os = "dragonfly", target_os = "freebsd")))]
MAP_NORESERVE;
/// Populate page tables for a mapping.
#[cfg(any(target_os = "android", target_os = "linux"))]
Expand Down Expand Up @@ -122,8 +122,8 @@ libc_bitflags!{
MAP_NOSYNC;
/// Rename private pages to a file.
///
/// This was removed in FreeBSD 11.
#[cfg(any(target_os = "dragonfly", target_os = "netbsd", target_os = "openbsd"))]
/// This was removed in FreeBSD 11 and is unused in DragonFlyBSD.
#[cfg(any(target_os = "netbsd", target_os = "openbsd"))]
MAP_RENAME;
/// Region may contain semaphores.
#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
Expand Down
2 changes: 1 addition & 1 deletion src/unistd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2742,7 +2742,7 @@ impl From<User> for libc::passwd {
pw_age: CString::new("").unwrap().into_raw(),
#[cfg(target_os = "illumos")]
pw_comment: CString::new("").unwrap().into_raw(),
#[cfg(target_os = "freebsd")]
#[cfg(any(target_os = "dragonfly", target_os = "freebsd"))]
pw_fields: 0,
}
}
Expand Down

0 comments on commit f9d508f

Please sign in to comment.