From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 14 Sep 2006 18:06:04 +0000 (+0000)
Subject: libjava
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b10a441e5eb59b2db11397d11f17a525d321abf4;p=gc

libjava
	PR boehm-gc/29068:
	* boehm.cc (_Jv_GCAttachThread): Disable on Solaris.
	(_Jv_GCDetachThread): Likewise.
boehm-gc
	PR boehm-gc/29068.
	* misc.c (GC_init_inner): Don't use GC_get_thread_stack_base on
	Solaris.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116948 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/ChangeLog b/ChangeLog
index 70dcfb0d..bf4f0cd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-14  Tom Tromey  <tromey@redhat.com>
+
+	PR boehm-gc/29068.
+	* misc.c (GC_init_inner): Don't use GC_get_thread_stack_base on
+	Solaris.
+
 2006-08-21  Bryce McKinlay  <mckinlay@redhat.com>
 	
 	PR libgcj/13212:
diff --git a/misc.c b/misc.c
index 23e226df..069c7d57 100644
--- a/misc.c
+++ b/misc.c
@@ -674,7 +674,7 @@ void GC_init_inner()
 #   if !defined(THREADS) || defined(GC_PTHREADS) || defined(GC_WIN32_THREADS) \
 	|| defined(GC_SOLARIS_THREADS)
       if (GC_stackbottom == 0) {
-        # ifdef GC_PTHREADS
+        # if defined(GC_PTHREADS) && ! defined(GC_SOLARIS_THREADS)
 	/* Use thread_stack_base if available, as GC could be initialized from
 	   a thread that is not the "main" thread.  */
 	GC_stackbottom = GC_get_thread_stack_base();