From 3bf9a65dd9cd900147220f8c8256c105c693a61a Mon Sep 17 00:00:00 2001 From: davem Date: Sun, 17 Apr 2005 22:01:21 +0000 Subject: [PATCH] 2005-04-17 David S. Miller * include/private/gcconfig.h (sparc-linux): Use LINUX_STACKBOTTOM. * os_dep.c (GC_linux_stack_base): Check for bug present in some Sparc glibc variants where __libc_stack_end is erroneously set to "1". Fallback to procfs code in that case. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98303 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 7 +++++++ include/private/gcconfig.h | 4 +--- os_dep.c | 9 +++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc73cc4f..87ca45c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-04-17 David S. Miller + + * include/private/gcconfig.h (sparc-linux): Use LINUX_STACKBOTTOM. + * os_dep.c (GC_linux_stack_base): Check for bug present in some + Sparc glibc variants where __libc_stack_end is erroneously set + to "1". Fallback to procfs code in that case. + 2005-04-12 Mike Stump * configure: Regenerate. diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index 7f3b63e4..a9ed7176 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -924,12 +924,10 @@ extern ptr_t GC_SysVGetDataStart(); # ifdef __arch64__ # define DATASTART GC_SysVGetDataStart(0x100000, _etext) - /* libc_stack_end is not set reliably for sparc64 */ -# define STACKBOTTOM ((ptr_t) 0x80000000000ULL) # else # define DATASTART GC_SysVGetDataStart(0x10000, _etext) -# define LINUX_STACKBOTTOM # endif +# define LINUX_STACKBOTTOM # endif # ifdef OPENBSD # define OS_TYPE "OPENBSD" diff --git a/os_dep.c b/os_dep.c index 21d05635..30c2b8bc 100644 --- a/os_dep.c +++ b/os_dep.c @@ -945,7 +945,16 @@ ptr_t GC_get_stack_base() } /* Otherwise it's not safe to add 16 bytes and we fall */ /* back to using /proc. */ # else +# ifdef SPARC + /* Older versions of glibc for 64-bit Sparc do not set + * this variable correctly, it gets set to either zero + * or one. + */ + if (__libc_stack_end != (ptr_t) (unsigned long)0x1) + return __libc_stack_end; +# else return __libc_stack_end; +# endif # endif } f = open("/proc/self/stat", O_RDONLY); -- 2.49.0