Skip to content

Commit 01eb85d

Browse files
committed
Auto merge of #3210 - devnexen:fbsd_elf_aux_info_constants, r=JohnTitor
freebsd add elf_aux_info constants
2 parents 6074ea8 + 4cba6f3 commit 01eb85d

File tree

4 files changed

+19
-1
lines changed

4 files changed

+19
-1
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ task:
1515
task:
1616
name: nightly x86_64-unknown-freebsd-13
1717
freebsd_instance:
18-
image_family: freebsd-13-1
18+
image_family: freebsd-13-2
1919
setup_script:
2020
- pkg install -y libnghttp2 curl
2121
- curl https://sh.rustup.rs -sSf --output rustup.sh

libc-test/build.rs

+3
Original file line numberDiff line numberDiff line change
@@ -2296,6 +2296,9 @@ fn test_freebsd(target: &str) {
22962296
// Added in FreeBSD 14
22972297
"EV_KEEPUDATA" if Some(14) > freebsd_ver => true,
22982298

2299+
// Added in FreeBSD 13.2
2300+
"AT_USRSTACKBASE" | "AT_USRSTACKLIM" if Some(13) > freebsd_ver => true,
2301+
22992302
_ => false,
23002303
}
23012304
});

libc-test/semver/freebsd.txt

+6
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ ATF_PERM
8484
ATF_PUBL
8585
ATF_USETRAILERS
8686
AT_BASE
87+
AT_CANARY
8788
AT_EACCESS
8889
AT_EGID
8990
AT_EMPTY_PATH
@@ -93,8 +94,13 @@ AT_EXECPATH
9394
AT_FDCWD
9495
AT_FLAGS
9596
AT_GID
97+
AT_HWCAP
98+
AT_HWCAP2
99+
AT_NCPUS
96100
AT_NOTELF
97101
AT_NULL
102+
AT_OSRELDATE
103+
AT_PAGESIZES
98104
AT_PAGESZ
99105
AT_PHDR
100106
AT_PHENT

src/unix/bsd/freebsdlike/freebsd/mod.rs

+9
Original file line numberDiff line numberDiff line change
@@ -3767,6 +3767,15 @@ pub const AT_EUID: ::c_int = 12;
37673767
pub const AT_GID: ::c_int = 13;
37683768
pub const AT_EGID: ::c_int = 14;
37693769
pub const AT_EXECPATH: ::c_int = 15;
3770+
pub const AT_CANARY: ::c_int = 16;
3771+
pub const AT_OSRELDATE: ::c_int = 18;
3772+
pub const AT_NCPUS: ::c_int = 19;
3773+
pub const AT_PAGESIZES: ::c_int = 20;
3774+
pub const AT_TIMEKEEP: ::c_int = 22;
3775+
pub const AT_HWCAP: ::c_int = 25;
3776+
pub const AT_HWCAP2: ::c_int = 26;
3777+
pub const AT_USRSTACKBASE: ::c_int = 35;
3778+
pub const AT_USRSTACKLIM: ::c_int = 36;
37703779

37713780
pub const TABDLY: ::tcflag_t = 0x00000004;
37723781
pub const TAB0: ::tcflag_t = 0x00000000;

0 commit comments

Comments
 (0)