From 5d058e63324d16748fb9d6cae682f17f7f6095cc Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Sun, 3 Jul 2022 21:28:57 +0200 Subject: [PATCH] Backout synthesizing AT_BSDFLAGS auxv entry This was causing a crash on several FreeBSD 13.1 testcases (but not 13.0). Probably related to "sig fastblock". --- coregrind/m_initimg/initimg-freebsd.c | 4 +++- none/tests/freebsd/auxv.stderr.exp-freebsd13 | 2 +- none/tests/freebsd/auxv.stderr.exp-freebsd131 | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coregrind/m_initimg/initimg-freebsd.c b/coregrind/m_initimg/initimg-freebsd.c index d77ce3c28e..f315a147ff 100644 --- a/coregrind/m_initimg/initimg-freebsd.c +++ b/coregrind/m_initimg/initimg-freebsd.c @@ -685,7 +685,9 @@ Addr setup_client_stack( void* init_sp, #endif #if (FREEBSD_VERS >= FREEBSD_13_0) - case AT_BSDFLAGS: + /* @todo PJF BSDFLAGS causes serveral testcases to crash. + Not sure why, it seems to be used for sigfastblock */ + // case AT_BSDFLAGS: case AT_ARGC: case AT_ENVC: break; diff --git a/none/tests/freebsd/auxv.stderr.exp-freebsd13 b/none/tests/freebsd/auxv.stderr.exp-freebsd13 index 9248b17a58..b4a0a68601 100644 --- a/none/tests/freebsd/auxv.stderr.exp-freebsd13 +++ b/none/tests/freebsd/auxv.stderr.exp-freebsd13 @@ -15,7 +15,7 @@ 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_BSDFLAGS int: 27 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........ diff --git a/none/tests/freebsd/auxv.stderr.exp-freebsd131 b/none/tests/freebsd/auxv.stderr.exp-freebsd131 index af70ce3160..2dd0b3c2df 100644 --- a/none/tests/freebsd/auxv.stderr.exp-freebsd131 +++ b/none/tests/freebsd/auxv.stderr.exp-freebsd131 @@ -15,7 +15,7 @@ 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_BSDFLAGS int: 27 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........ -- 2.47.2