From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sat, 14 May 2022 14:24:22 +0000 (+0200)
Subject: Changes to auxv for FreeBSD 13.1
X-Git-Tag: VALGRIND_3_20_0~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e5073f853c0954147938cced1ed219f4bc2df32;p=thirdparty%2Fvalgrind.git

Changes to auxv for FreeBSD 13.1
---

diff --git a/none/tests/freebsd/Makefile.am b/none/tests/freebsd/Makefile.am
index 5fc3e96972..4b94071b4b 100644
--- a/none/tests/freebsd/Makefile.am
+++ b/none/tests/freebsd/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = \
 	auxv.stderr.exp \
 	auxv.stderr.exp-32on64 \
 	auxv.stderr.exp-freebsd13 \
+	auxv.stderr.exp-freebsd131 \
 	osrel.vgtest \
 	osrel.stderr.exp \
 	osrel.stdout.exp \
diff --git a/none/tests/freebsd/auxv.c b/none/tests/freebsd/auxv.c
index ce13b6e131..9033c3427e 100644
--- a/none/tests/freebsd/auxv.c
+++ b/none/tests/freebsd/auxv.c
@@ -48,7 +48,7 @@ Elf_AuxStr aux_map[AT_COUNT] = {
         {"AT_PS_STRINGS", 32},
 //        {"AT_COUNT", 33},
 #endif
-#if (FREEBSD_VERS >= FREEBSD_14)
+#if (FREEBSD_VERS >= FREEBSD_13_1)
         {"AT_FXRNG", 33},
         {"AT_KPRELOAD", 34},
 
diff --git a/none/tests/freebsd/auxv.stderr.exp-freebsd131 b/none/tests/freebsd/auxv.stderr.exp-freebsd131
new file mode 100644
index 0000000000..f35916f4b3
--- /dev/null
+++ b/none/tests/freebsd/auxv.stderr.exp-freebsd131
@@ -0,0 +1,24 @@
+val: AT_PHDR int: 03 ptr: 0x........
+val: AT_PHENT int: 04 ptr: 0x........
+val: AT_PHNUM int: 05 ptr: 0x........
+val: AT_PAGESZ int: 06 ptr: 0x........
+val: AT_FLAGS int: 08 ptr: 0x........
+val: AT_ENTRY int: 09 ptr: 0x........
+val: AT_BASE int: 07 ptr: 0x........
+val: AT_EHDRFLAGS int: 24 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_OSRELDATE int: 18 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_NCPUS int: 19 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_STACKPROT int: 23 ptr: 0x........
+val: AT_BSDFLAGS int: 27 ptr: 0x........
+val: AT_ARGC int: 28 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_ENVC int: 30 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........