Luming Wang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/53183 )
Change subject: sim: fix build error when glibc >= 2.34
......................................................................
sim: fix build error when glibc >= 2.34
Since glibc >= 2.34, MINSIGSTKSZ and SIGSTKSZ are no longer
constant on Linux. As a result, the definition
"fatalSigStack[2*SIGSTKSZ]" fails to be compiled.
Thus, we need to dynamically allocate it.
Change-Id: Ibccc367818483b9c94beda871d1d95367d1e8b04
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/53183
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/sim/init_signals.cc
1 file changed, 23 insertions(+), 4 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/init_signals.cc b/src/sim/init_signals.cc
index cac0190..b6db621 100644
--- a/src/sim/init_signals.cc
+++ b/src/sim/init_signals.cc
@@ -64,18 +64,19 @@
{
// Use an separate stack for fatal signal handlers
-static uint8_t fatalSigStack[2 * SIGSTKSZ];
static bool
setupAltStack()
{
+ const auto stack_size = 2 * SIGSTKSZ;
+ static uint8_t *fatal_sig_stack = new uint8_t[stack_size];
stack_t stack;
#if defined(__FreeBSD__) && (__FreeBSD_version < 1100097)
- stack.ss_sp = (char *)fatalSigStack;
+ stack.ss_sp = (char *)fatal_sig_stack;
#else
- stack.ss_sp = fatalSigStack;
+ stack.ss_sp = fatal_sig_stack;
#endif
- stack.ss_size = sizeof(fatalSigStack);
+ stack.ss_size = stack_size;
stack.ss_flags = 0;
return sigaltstack(&stack, NULL) == 0;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/53183
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ibccc367818483b9c94beda871d1d95367d1e8b04
Gerrit-Change-Number: 53183
Gerrit-PatchSet: 5
Gerrit-Owner: Luming Wang <wlm199...@126.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Luming Wang <wlm199...@126.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Jason Lowe-Power <power...@gmail.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s