Auto merge of #2349 - devnexen:netbsd_auxv_types, r=Amanieu

netbsd add auxiliary vector query ids.

4 files changed, 61 insertions, 0 deletions

diff --git a/libc-test/build.rs b/libc-test/build.rs
index ad9c2152dc..a4f65ba0e9 100755
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -956,6 +956,7 @@ fn test_netbsd(target: &str) {
         "signal.h",
         "string.h",
         "sys/endian.h",
+        "sys/exec_elf.h",
         "sys/extattr.h",
         "sys/file.h",
         "sys/ioctl.h",
diff --git a/libc-test/semver/netbsd-x86_64.txt b/libc-test/semver/netbsd-x86_64.txt
index 1f14a08847..573099c8bb 100644
--- a/libc-test/semver/netbsd-x86_64.txt
+++ b/libc-test/semver/netbsd-x86_64.txt
@@ -1,3 +1,4 @@
+Aux64Info
 PT_GETFPREGS
 PT_GETREGS
 PT_SETFPREGS
diff --git a/libc-test/semver/netbsd.txt b/libc-test/semver/netbsd.txt
index 5af0b1605d..554e6d386f 100644
--- a/libc-test/semver/netbsd.txt
+++ b/libc-test/semver/netbsd.txt
@@ -58,11 +58,40 @@ ATF_COM
 ATF_PERM
 ATF_PUBL
 ATF_USETRAILERS
+AT_BASE
+AT_DCACHEBSIZE
 AT_EACCESS
+AT_EGID
+AT_ENTRY
+AT_EUID
+AT_EXECFD
 AT_FDCWD
+AT_FLAGS
+AT_ICACHEBSIZE
+AT_IGNORE
+AT_NULL
+AT_PAGESZ
+AT_PHDR
+AT_PHENT
+AT_PHNUM
 AT_REMOVEDIR
+AT_RGID
+AT_RUID
+AT_SUN_CPU
+AT_SUN_EMUL_ENTRY
+AT_SUN_EMUL_EXECFD
+AT_SUN_EXECNAME
+AT_SUN_HWCAP
+AT_SUN_IFLUSH
+AT_SUN_LDELF
+AT_SUN_LDNAME
+AT_SUN_LDSHDR
+AT_SUN_LPGSIZE
+AT_SUN_PLATFORM
+AT_STACKBASE
 AT_SYMLINK_FOLLOW
 AT_SYMLINK_NOFOLLOW
+AT_UCACHEBSIZE
 B14400
 B28800
 B460800
diff --git a/src/unix/bsd/netbsdlike/netbsd/mod.rs b/src/unix/bsd/netbsdlike/netbsd/mod.rs
index 4bfb7e06d8..474698af0c 100644
--- a/src/unix/bsd/netbsdlike/netbsd/mod.rs
+++ b/src/unix/bsd/netbsdlike/netbsd/mod.rs
@@ -1039,6 +1039,36 @@ pub const AT_SYMLINK_NOFOLLOW: ::c_int = 0x200;
 pub const AT_SYMLINK_FOLLOW: ::c_int = 0x400;
 pub const AT_REMOVEDIR: ::c_int = 0x800;
 
+pub const AT_NULL: ::c_int = 0;
+pub const AT_IGNORE: ::c_int = 1;
+pub const AT_EXECFD: ::c_int = 2;
+pub const AT_PHDR: ::c_int = 3;
+pub const AT_PHENT: ::c_int = 4;
+pub const AT_PHNUM: ::c_int = 5;
+pub const AT_PAGESZ: ::c_int = 6;
+pub const AT_BASE: ::c_int = 7;
+pub const AT_FLAGS: ::c_int = 8;
+pub const AT_ENTRY: ::c_int = 9;
+pub const AT_DCACHEBSIZE: ::c_int = 10;
+pub const AT_ICACHEBSIZE: ::c_int = 11;
+pub const AT_UCACHEBSIZE: ::c_int = 12;
+pub const AT_STACKBASE: ::c_int = 13;
+pub const AT_EUID: ::c_int = 2000;
+pub const AT_RUID: ::c_int = 2001;
+pub const AT_EGID: ::c_int = 2002;
+pub const AT_RGID: ::c_int = 2003;
+pub const AT_SUN_LDELF: ::c_int = 2004;
+pub const AT_SUN_LDSHDR: ::c_int = 2005;
+pub const AT_SUN_LDNAME: ::c_int = 2006;
+pub const AT_SUN_LDPGSIZE: ::c_int = 2007;
+pub const AT_SUN_PLATFORM: ::c_int = 2008;
+pub const AT_SUN_HWCAP: ::c_int = 2009;
+pub const AT_SUN_IFLUSH: ::c_int = 2010;
+pub const AT_SUN_CPU: ::c_int = 2011;
+pub const AT_SUN_EMUL_ENTRY: ::c_int = 2012;
+pub const AT_SUN_EMUL_EXECFD: ::c_int = 2013;
+pub const AT_SUN_EXECNAME: ::c_int = 2014;
+
 pub const EXTATTR_NAMESPACE_USER: ::c_int = 1;
 pub const EXTATTR_NAMESPACE_SYSTEM: ::c_int = 2;