[gcc r11-7523] Fix build breakage with latest glibc release

Eric Botcazou ebotcazou@gcc.gnu.org
Fri Mar 5 11:47:57 GMT 2021


https://gcc.gnu.org/g:331763de7d4850702a0f67298f36017c73cdb103

commit r11-7523-g331763de7d4850702a0f67298f36017c73cdb103
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Fri Mar 5 12:45:41 2021 +0100

    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.

Diff:
---
 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 e76aa79c5a8..3ceb1a31b02 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -579,12 +579,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 f7af00bf5e2..2272f83d68d 100644
--- a/gcc/ada/libgnarl/s-osinte__linux.ads
+++ b/gcc/ada/libgnarl/s-osinte__linux.ads
@@ -328,7 +328,7 @@ package System.OS_Interface is
       oss : access stack_t) return int;
    pragma Import (C, sigaltstack, "sigaltstack");
 
-   Alternate_Stack_Size : constant := 16 * 1024;
+   Alternate_Stack_Size : constant := 32 * 1024;
    --  This must be in keeping with init.c:__gnat_alternate_stack
 
    Alternate_Stack : aliased char_array (1 .. Alternate_Stack_Size);


More information about the Gcc-cvs mailing list