|
From: Paul F. <pa...@so...> - 2023-04-13 20:49:48
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=0ae17c117edbad1785c148693a31268b3bec4565 commit 0ae17c117edbad1785c148693a31268b3bec4565 Author: Paul Floyd <pj...@wa...> Date: Thu Apr 13 22:45:46 2023 +0200 FreeBSD: auxv changes for FreeBSD 13.2 Diff: --- configure.ac | 13 ++++++++++--- coregrind/m_initimg/initimg-freebsd.c | 2 +- none/tests/freebsd/auxv.c | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index a8d9b95138..80bdbb417c 100755 --- a/configure.ac +++ b/configure.ac @@ -398,8 +398,10 @@ case "${host_os}" in freebsd_12_2=1220 AC_DEFINE([FREEBSD_13_0], 1300, [FREEBSD_VERS value for FreeBSD 13.0]) freebsd_13_0=1300 - AC_DEFINE([FREEBSD_13_1], 1310, [FREEBSD_VERS value for FreeBSD 13.1+]) + AC_DEFINE([FREEBSD_13_1], 1310, [FREEBSD_VERS value for FreeBSD 13.1]) freebsd_13_1=1310 + AC_DEFINE([FREEBSD_13_2], 1320, [FREEBSD_VERS value for FreeBSD 13.2]) + freebsd_13_2=1320 AC_DEFINE([FREEBSD_14], 1400, [FREEBSD_VERS value for FreeBSD 14.x]) freebsd_14=1400 @@ -438,11 +440,16 @@ case "${host_os}" in AC_DEFINE([FREEBSD_VERS], FREEBSD_13_0, [FreeBSD version]) freebsd_vers=$freebsd_13_0 ;; - *) - AC_MSG_RESULT([FreeBSD 13.1+ (${kernel})]) + 13.1-*) + AC_MSG_RESULT([FreeBSD 13.1 (${kernel})]) AC_DEFINE([FREEBSD_VERS], FREEBSD_13_1, [FreeBSD version]) freebsd_vers=$freebsd_13_1 ;; + 13.2-*) + AC_MSG_RESULT([FreeBSD 13.2 (${kernel})]) + AC_DEFINE([FREEBSD_VERS], FREEBSD_13_2, [FreeBSD version]) + freebsd_vers=$freebsd_13_2 + ;; esac ;; 14.*) diff --git a/coregrind/m_initimg/initimg-freebsd.c b/coregrind/m_initimg/initimg-freebsd.c index 53a9aca873..ba01279ebb 100644 --- a/coregrind/m_initimg/initimg-freebsd.c +++ b/coregrind/m_initimg/initimg-freebsd.c @@ -742,7 +742,7 @@ static Addr setup_client_stack(void* init_sp, // case AT_KPRELOAD: #endif -#if (FREEBSD_VERS >= FREEBSD_14) +#if (FREEBSD_VERS >= FREEBSD_13_2) case VKI_AT_USRSTACKBASE: auxv->u.a_val = VG_(get_usrstack)(); break; diff --git a/none/tests/freebsd/auxv.c b/none/tests/freebsd/auxv.c index 6425fc3043..f2e1299045 100644 --- a/none/tests/freebsd/auxv.c +++ b/none/tests/freebsd/auxv.c @@ -54,7 +54,7 @@ Elf_AuxStr aux_map[AT_COUNT] = { {"AT_KPRELOAD", 34}, // {"AT_COUNT", 35}, #endif -#if (FREEBSD_VERS >= FREEBSD_14) +#if (FREEBSD_VERS >= FREEBSD_13_2) {"AT_USRSTACKBASE", 35}, {"AT_USRSTACKLIM", 36}, // {"AT_COUNT", 37}, |