Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

freebsd add elf_aux_info constants #3210

Merged
merged 2 commits into from
Apr 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ task:
task:
name: nightly x86_64-unknown-freebsd-13
freebsd_instance:
image_family: freebsd-13-1
image_family: freebsd-13-2
setup_script:
- pkg install -y libnghttp2 curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
Expand Down
3 changes: 3 additions & 0 deletions libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2286,6 +2286,9 @@ fn test_freebsd(target: &str) {
// Added in FreeBSD 14
"EV_KEEPUDATA" if Some(14) > freebsd_ver => true,

// Added in FreeBSD 13.2
"AT_USRSTACKBASE" | "AT_USRSTACKLIM" if Some(13) > freebsd_ver => true,

_ => false,
}
});
Expand Down
6 changes: 6 additions & 0 deletions libc-test/semver/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ ATF_PERM
ATF_PUBL
ATF_USETRAILERS
AT_BASE
AT_CANARY
AT_EACCESS
AT_EGID
AT_EMPTY_PATH
Expand All @@ -93,8 +94,13 @@ AT_EXECPATH
AT_FDCWD
AT_FLAGS
AT_GID
AT_HWCAP
AT_HWCAP2
AT_NCPUS
AT_NOTELF
AT_NULL
AT_OSRELDATE
AT_PAGESIZES
AT_PAGESZ
AT_PHDR
AT_PHENT
Expand Down
9 changes: 9 additions & 0 deletions src/unix/bsd/freebsdlike/freebsd/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3767,6 +3767,15 @@ pub const AT_EUID: ::c_int = 12;
pub const AT_GID: ::c_int = 13;
pub const AT_EGID: ::c_int = 14;
pub const AT_EXECPATH: ::c_int = 15;
pub const AT_CANARY: ::c_int = 16;
pub const AT_OSRELDATE: ::c_int = 18;
pub const AT_NCPUS: ::c_int = 19;
pub const AT_PAGESIZES: ::c_int = 20;
pub const AT_TIMEKEEP: ::c_int = 22;
pub const AT_HWCAP: ::c_int = 25;
pub const AT_HWCAP2: ::c_int = 26;
pub const AT_USRSTACKBASE: ::c_int = 35;
pub const AT_USRSTACKLIM: ::c_int = 36;

pub const TABDLY: ::tcflag_t = 0x00000004;
pub const TAB0: ::tcflag_t = 0x00000000;
Expand Down