From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Tue, 18 Oct 2022 22:51:05 +0000 (+0200)
Subject:  Auxv user stack for FreeBSD, last part
X-Git-Tag: VALGRIND_3_20_0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12d2a3c85d41db5f540ce3a21cba749641ce4a31;p=thirdparty%2Fvalgrind.git

 Auxv user stack for FreeBSD, last part

Clean up, didn't need an extra func for user stack limit.
---

diff --git a/coregrind/m_initimg/initimg-freebsd.c b/coregrind/m_initimg/initimg-freebsd.c
index 43b88948af..8188e60d90 100644
--- a/coregrind/m_initimg/initimg-freebsd.c
+++ b/coregrind/m_initimg/initimg-freebsd.c
@@ -718,7 +718,7 @@ Addr setup_client_stack( void*  init_sp,
          auxv->u.a_val = VG_(get_usrstack)();
          break;
       case AT_USRSTACKLIM:
-         auxv->u.a_val = VG_(get_usrstacklim)();
+         auxv->u.a_val = clstack_max_size;
          break;
 #endif
 
diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 327a130a80..f02a8b0eb5 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -3908,11 +3908,6 @@ Word VG_(get_usrstack)(void)
 {
    return VG_PGROUNDDN(the_iicii.clstack_end) + VKI_PAGE_SIZE;
 }
-
-Word VG_(get_usrstacklim)(void)
-{
-   return the_iifii.clstack_max_size;
-}
 #endif
 
 
diff --git a/coregrind/pub_core_aspacemgr.h b/coregrind/pub_core_aspacemgr.h
index 1a73ac1a34..b867108a22 100644
--- a/coregrind/pub_core_aspacemgr.h
+++ b/coregrind/pub_core_aspacemgr.h
@@ -387,7 +387,6 @@ extern Bool VG_(am_search_for_new_segment)(Addr *start, SizeT *size,
 #if defined(VGO_freebsd)
 /* For kern.usrstack syscall on FreeBSD */
 extern Word VG_(get_usrstack)(void);
-extern Word VG_(get_usrstacklim)(void);
 #endif
 
 #endif   // __PUB_CORE_ASPACEMGR_H
diff --git a/none/tests/freebsd/auxv.c b/none/tests/freebsd/auxv.c
index 778280b39a..49911deaed 100644
--- a/none/tests/freebsd/auxv.c
+++ b/none/tests/freebsd/auxv.c
@@ -55,7 +55,7 @@ Elf_AuxStr aux_map[AT_COUNT] = {
 #endif
 #if (FREEBSD_VERS >= FREEBSD_14)
         {"AT_USRSTACKBASE", 35},
-        {"AT_USRSTACKLIM", 36),
+        {"AT_USRSTACKLIM", 36},
 //      {"AT_COUNT", 37},
 #endif
 };
diff --git a/none/tests/freebsd/auxv.stderr.exp-freebsd14 b/none/tests/freebsd/auxv.stderr.exp-freebsd14
new file mode 100644
index 0000000000..76c6db5759
--- /dev/null
+++ b/none/tests/freebsd/auxv.stderr.exp-freebsd14
@@ -0,0 +1,26 @@
+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_EXECPATH int: 15 ptr: 0x........
+val: AT_OSRELDATE int: 18 ptr: 0x........
+val: AT_CANARY int: 16 ptr: 0x........
+val: AT_CANARYLEN int: 17 ptr: 0x........
+val: AT_NCPUS int: 19 ptr: 0x........
+val: AT_PAGESIZES int: 20 ptr: 0x........
+val: AT_PAGESIZESLEN int: 21 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_STACKPROT int: 23 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_ARGC int: 28 ptr: 0x........
+val: AT_ARGV int: 29 ptr: 0x........
+val: AT_ENVC int: 30 ptr: 0x........
+val: AT_ENVV int: 31 ptr: 0x........
+val: AT_PS_STRINGS int: 32 ptr: 0x........
+val: AT_IGNORE int: 01 ptr: 0x........
+val: AT_USRSTACKBASE int: 35 ptr: 0x........
+val: AT_USRSTACKLIM int: 36 ptr: 0x........