diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rwxr-xr-x | libjava/configure | 13 | ||||
| -rw-r--r-- | libjava/configure.ac | 13 |
3 files changed, 33 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index de24a9ece25..7d01621d390 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2010-07-23 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * configure.ac (*-*-solaris2.8): Use alternate thread library. + Add libthread. + (*-*-solaris2.9): Use libthread. + * configure: Regenerate. + 2010-07-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * include/sparc-signal.h: Renamed to ... diff --git a/libjava/configure b/libjava/configure index 89d5b6c4a8d..8ccfa24cc12 100755 --- a/libjava/configure +++ b/libjava/configure @@ -20712,6 +20712,19 @@ case "$THREADS" in THREADLIBS='-lpthread -lrt' THREADSPEC='-lpthread -lrt' ;; + *-*-solaris2.8) + # Always use alternate thread library on Solaris 8. Need libthread + # for TLS support. + # Need -Wl,-R to get it through libtool ... + THREADLIBS='-L/usr/lib/lwp$(MULTISUBDIR) -Wl,-R -Wl,/usr/lib/lwp$(MULTISUBDIR) -lpthread -lthread' + # ... while ld only accepts -R. + THREADSPEC='-L/usr/lib/lwp%{m64:/64} -R/usr/lib/lwp%{m64:/64} -lpthread -lthread' + ;; + *-*-solaris2.9) + # As on Solaris 8, need libthread for TLS support. + THREADLIBS='-lpthread -lthread' + THREADSPEC='-lpthread -lthread' + ;; *) THREADLIBS=-lpthread THREADSPEC=-lpthread diff --git a/libjava/configure.ac b/libjava/configure.ac index 477766ae1ca..125e9ce9b46 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1064,6 +1064,19 @@ case "$THREADS" in THREADLIBS='-lpthread -lrt' THREADSPEC='-lpthread -lrt' ;; + *-*-solaris2.8) + # Always use alternate thread library on Solaris 8. Need libthread + # for TLS support. + # Need -Wl,-R to get it through libtool ... + THREADLIBS='-L/usr/lib/lwp$(MULTISUBDIR) -Wl,-R -Wl,/usr/lib/lwp$(MULTISUBDIR) -lpthread -lthread' + # ... while ld only accepts -R. + THREADSPEC='-L/usr/lib/lwp%{m64:/64} -R/usr/lib/lwp%{m64:/64} -lpthread -lthread' + ;; + *-*-solaris2.9) + # As on Solaris 8, need libthread for TLS support. + THREADLIBS='-lpthread -lthread' + THREADSPEC='-lpthread -lthread' + ;; *) THREADLIBS=-lpthread THREADSPEC=-lpthread |