Auto merge of #3210 - devnexen:fbsd_elf_aux_info_constants, r=JohnTitor

freebsd add elf_aux_info constants
rust-lang · Apr 23, 2023 · 01eb85d · 01eb85d
2 parents 6074ea8 + 4cba6f3
commit 01eb85d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -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

diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -2296,6 +2296,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,
         }
     });

diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt
@@ -84,6 +84,7 @@ ATF_PERM
 ATF_PUBL
 ATF_USETRAILERS
 AT_BASE
+AT_CANARY
 AT_EACCESS
 AT_EGID
 AT_EMPTY_PATH
@@ -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

diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -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;