aboutsummaryrefslogtreecommitdiff
path: root/boehm-gc
diff options
context:
space:
mode:
authorRainer Orth <ro@TechFak.Uni-Bielefeld.DE>2001-09-26 13:22:03 +0000
committerRainer Orth <ro@gcc.gnu.org>2001-09-26 13:22:03 +0000
commit9c383523a3f308e683dea3fb80e5774bfb2a040f (patch)
tree7e32e0f9d21a9ef116c976946744c146a00a2a6d /boehm-gc
parent2e10660228633fdb4b85d72a460a8475d56058ac (diff)
downloadgcc-9c383523a3f308e683dea3fb80e5774bfb2a040f.zip
gcc-9c383523a3f308e683dea3fb80e5774bfb2a040f.tar.gz
gcc-9c383523a3f308e683dea3fb80e5774bfb2a040f.tar.bz2
solaris_threads.c (MAX_ORIG_STACK_SIZE): Provide special Solaris 2/Intel definition.
* solaris_threads.c (MAX_ORIG_STACK_SIZE) [I386]: Provide special Solaris 2/Intel definition. * configure.in (i?86-*-solaris2.[89]*): Define SOLARIS25_PROC_VDB_BUG_FIXED. * include/private/gcconfig.h [I386 && SUNOS5]: Use it. * configure: Regenerate. * include/private/gcconfig.h [I386 && SUNOS5] (DATASTART): Use _etext. (DATAEND): Define using _end. From-SVN: r45825
Diffstat (limited to 'boehm-gc')
-rw-r--r--boehm-gc/ChangeLog13
-rwxr-xr-xboehm-gc/configure6
-rw-r--r--boehm-gc/configure.in3
-rw-r--r--boehm-gc/include/private/gcconfig.h9
-rw-r--r--boehm-gc/solaris_threads.c11
5 files changed, 39 insertions, 3 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index d1c9c04..a97a5e9 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,16 @@
+2001-09-26 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ * solaris_threads.c (MAX_ORIG_STACK_SIZE) [I386]: Provide special
+ Solaris 2/Intel definition.
+
+ * configure.in (i?86-*-solaris2.[89]*): Define
+ SOLARIS25_PROC_VDB_BUG_FIXED.
+ * include/private/gcconfig.h [I386 && SUNOS5]: Use it.
+ * configure: Regenerate.
+
+ * include/private/gcconfig.h [I386 && SUNOS5] (DATASTART): Use _etext.
+ (DATAEND): Define using _end.
+
2001-09-11 Per Bothner <per@bothner.com>
* include/Makefile.am: New file. It defines include_HEADERS.
diff --git a/boehm-gc/configure b/boehm-gc/configure
index b975d0c..79d9655 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -2807,6 +2807,12 @@ case "$host" in
alpha*-*-*)
machdep="alpha_mach_dep.lo"
;;
+ i?86-*-solaris2.[89]*)
+ cat >> confdefs.h <<\EOF
+#define SOLARIS25_PROC_VDB_BUG_FIXED 1
+EOF
+
+ ;;
mipstx39-*-elf*)
machdep="mips_ultrix_mach_dep.lo"
cat >> confdefs.h <<\EOF
diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in
index 8fc2cdf..48f6990 100644
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -153,6 +153,9 @@ case "$host" in
alpha*-*-*)
machdep="alpha_mach_dep.lo"
;;
+ i?86-*-solaris2.[[89]]*)
+ AC_DEFINE(SOLARIS25_PROC_VDB_BUG_FIXED)
+ ;;
mipstx39-*-elf*)
machdep="mips_ultrix_mach_dep.lo"
AC_DEFINE(STACKBASE, __stackbase)
diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
index e8bac1b..4e20f48 100644
--- a/boehm-gc/include/private/gcconfig.h
+++ b/boehm-gc/include/private/gcconfig.h
@@ -838,9 +838,10 @@
# endif
# ifdef SUNOS5
# define OS_TYPE "SUNOS5"
- extern int etext, _start;
+ extern int _etext, _end;
extern char * GC_SysVGetDataStart();
-# define DATASTART GC_SysVGetDataStart(0x1000, &etext)
+# define DATASTART GC_SysVGetDataStart(0x1000, &_etext)
+# define DATAEND (&_end)
/* # define STACKBOTTOM ((ptr_t)(&_start)) worked through 2.7, */
/* but reportedly breaks under 2.8. It appears that the stack */
/* base is a property of the executable, so this should not break */
@@ -849,7 +850,9 @@
# include <sys/vmparam.h>
# define STACKBOTTOM USRSTACK
/** At least in Solaris 2.5, PROC_VDB gives wrong values for dirty bits. */
-/*# define PROC_VDB*/
+# ifdef SOLARIS25_PROC_VDB_BUG_FIXED
+# define PROC_VDB
+# endif
# define DYNAMIC_LOADING
# ifndef USE_MMAP
# define USE_MMAP
diff --git a/boehm-gc/solaris_threads.c b/boehm-gc/solaris_threads.c
index 8cc6319..a0d0340 100644
--- a/boehm-gc/solaris_threads.c
+++ b/boehm-gc/solaris_threads.c
@@ -621,7 +621,18 @@ GC_thread GC_lookup_thread(thread_t id)
return(p);
}
+/* Solaris 2/Intel uses an initial stack size limit slightly bigger than the
+ SPARC default of 8 MB. Account for this to warn only if the user has
+ raised the limit beyond the default.
+
+ This is identical to DFLSSIZ defined in <sys/vm_machparam.h>. This file
+ is installed in /usr/platform/`uname -m`/include, which is not in the
+ default include directory list, so copy the definition here. */
+#ifdef I386
+# define MAX_ORIG_STACK_SIZE (8 * 1024 * 1024 + ((USRSTACK) & 0x3FFFFF))
+#else
# define MAX_ORIG_STACK_SIZE (8 * 1024 * 1024)
+#endif
word GC_get_orig_stack_size() {
struct rlimit rl;