summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/boehm.cc5
2 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 989738f5763..a4c80c9c3d2 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-14 Tom Tromey <tromey@redhat.com>
+
+ PR boehm-gc/29068:
+ * boehm.cc (_Jv_GCAttachThread): Disable on Solaris.
+ (_Jv_GCDetachThread): Likewise.
+
2006-09-14 Andreas Schwab <schwab@suse.de>
* posix-threads.cc: Include "posix.h".
diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index f96128e191d..2e382959ee4 100644
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -701,7 +701,8 @@ _Jv_GCAttachThread ()
{
// The registration interface is only defined on posixy systems and
// only actually works if pthread_getattr_np is defined.
-#ifdef HAVE_PTHREAD_GETATTR_NP
+ // FIXME: until gc7 it is simpler to disable this on solaris.
+#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS)
GC_register_my_thread ();
#endif
}
@@ -709,7 +710,7 @@ _Jv_GCAttachThread ()
void
_Jv_GCDetachThread ()
{
-#ifdef HAVE_PTHREAD_GETATTR_NP
+#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS)
GC_unregister_my_thread ();
#endif
}
OpenPOWER on IntegriCloud