From c85c24099b28f7af907466af2c1b73da9455368c Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Fri, 5 Mar 2021 12:45:41 +0100 Subject: [PATCH] Fix build breakage with latest glibc release gcc/ada/ PR ada/99264 * init.c (__gnat_alternate_sta) [Linux]: Remove preprocessor test on MINSIGSTKSZ and bump size to 32KB. * libgnarl/s-osinte__linux.ads (Alternate_Stack_Size): Bump to 32KB. --- gcc/ada/init.c | 8 ++------ gcc/ada/libgnarl/s-osinte__linux.ads | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/gcc/ada/init.c b/gcc/ada/init.c index 67ea4dc25798..54d9ac1417a9 100644 --- a/gcc/ada/init.c +++ b/gcc/ada/init.c @@ -578,12 +578,8 @@ __gnat_error_handler (int sig, siginfo_t *si ATTRIBUTE_UNUSED, void *ucontext) #ifndef __ia64__ #define HAVE_GNAT_ALTERNATE_STACK 1 -/* This must be in keeping with System.OS_Interface.Alternate_Stack_Size. - It must be larger than MINSIGSTKSZ and hopefully near 2 * SIGSTKSZ. */ -# if 16 * 1024 < MINSIGSTKSZ -# error "__gnat_alternate_stack too small" -# endif -char __gnat_alternate_stack[16 * 1024]; +/* This must be in keeping with System.OS_Interface.Alternate_Stack_Size. */ +char __gnat_alternate_stack[32 * 1024]; #endif #ifdef __XENO__ diff --git a/gcc/ada/libgnarl/s-osinte__linux.ads b/gcc/ada/libgnarl/s-osinte__linux.ads index 80cb2b2a793e..ef449af33d11 100644 --- a/gcc/ada/libgnarl/s-osinte__linux.ads +++ b/gcc/ada/libgnarl/s-osinte__linux.ads @@ -330,7 +330,7 @@ package System.OS_Interface is pragma Import (C, Alternate_Stack, "__gnat_alternate_stack"); -- The alternate signal stack for stack overflows - Alternate_Stack_Size : constant := 16 * 1024; + Alternate_Stack_Size : constant := 32 * 1024; -- This must be in keeping with init.c:__gnat_alternate_stack function Get_Stack_Base (thread : pthread_t) return Address; -- 2.47.2