diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-09-14 18:06:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-09-14 18:06:04 +0000 |
| commit | 975147a4a4a970261d30905dcf7e3fd683ce119f (patch) | |
| tree | e8f3771fa5de2790b3ddfc21a771278d9f7d803c | |
| parent | 351272b977fe8cbc4a94ced4b7d05a604a754a42 (diff) | |
| download | gcc-975147a4a4a970261d30905dcf7e3fd683ce119f.zip gcc-975147a4a4a970261d30905dcf7e3fd683ce119f.tar.gz gcc-975147a4a4a970261d30905dcf7e3fd683ce119f.tar.bz2 | |
re PR boehm-gc/29068 (Bootstrap fails building libjava on SPARC/Solaris)
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.
From-SVN: r116948
| -rw-r--r-- | boehm-gc/ChangeLog | 6 | ||||
| -rw-r--r-- | boehm-gc/misc.c | 2 | ||||
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/boehm.cc | 5 |
4 files changed, 16 insertions, 3 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 70dcfb0..bf4f0cd 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/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/boehm-gc/misc.c b/boehm-gc/misc.c index 23e226d..069c7d5 100644 --- a/boehm-gc/misc.c +++ b/boehm-gc/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(); diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 989738f..a4c80c9 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 f96128e..2e38295 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 } |