build broken for solaris

Wed Sep 13 23:56:00 GMT 2006

Tom> Give this a try.
Of course i forgot to append the patch.
Tom
Index: boehm-gc/misc.c
===================================================================

--- boehm-gc/misc.c	(revision 116849)
+++ boehm-gc/misc.c	(working copy)
@@ -674,7 +674,7 @@
 # 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();
Index: libjava/boehm.cc
===================================================================
--- libjava/boehm.cc	(revision 116891)
+++ libjava/boehm.cc	(working copy)
@@ -701,7 +701,8 @@
 {
 // 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 @@
 void
 _Jv_GCDetachThread ()
 {
-#ifdef HAVE_PTHREAD_GETATTR_NP
+#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS)
 GC_unregister_my_thread ();
 #endif
 }
