gcc:

	* gthr-solaris.h: Remove.
	* gthr.h (_SOLARIS_THREADS): Don't include gthr-solaris.h, remove.
	* config/sol2.h (CPP_SUBTARGET_SPEC): Remove -threads support.
	(LIB_SPEC): Likewise.
	* config/sol2.opt (threads): Remove.
	* config.gcc (i[34567]86-*-solaris2*): Remove solaris threads
	support.
	(sparc*-*-solaris2*): Likewise.
	* configure.ac (enable_threads): Enable solaris support.
	* configure: Regenerate.
	* doc/invoke.texi (Option Summary, Solaris 2 Options): Remove
	-threads.
	* doc/install.texi (Configuration, --enable-threads=lib): Remove
	solaris.

	boehm-gc:
	* configure.ac (THREADS): Remove solaris.
	* configure: Regenerate.

	libjava:
	* configure.ac (THREADS): Remove solaris.
	* configure: Regenerate.


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

16 files changed, 36 insertions, 595 deletions

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 3e4a6fa38dd..64736ecb0fa 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.ac (THREADS): Remove solaris.
+	* configure: Regenerate.
+
 2011-02-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure: Regenerate.
diff --git a/boehm-gc/configure b/boehm-gc/configure
index 9e9cd279b94..e3fdb060e64 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -14973,7 +14973,7 @@ $as_echo "#define DGUX_THREADS 1" >>confdefs.h
     $as_echo "#define _REENTRANT 1" >>confdefs.h
 
     ;;
- decosf1 | irix | mach | os2 | solaris | dce | vxworks)
+ decosf1 | irix | mach | os2 | dce | vxworks)
     as_fn_error "thread package $THREADS not yet supported" "$LINENO" 5
     ;;
  *)
diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac
index 61e12aafe67..696b961a94f 100644
--- a/boehm-gc/configure.ac
+++ b/boehm-gc/configure.ac
@@ -248,7 +248,7 @@ AC_MSG_RESULT($THREADLIBS)
     AC_DEFINE(GC_AIX_THREADS,1)
     AC_DEFINE(_REENTRANT,1)
     ;;
- decosf1 | irix | mach | os2 | solaris | dce | vxworks)
+ decosf1 | irix | mach | os2 | dce | vxworks)
     AC_MSG_ERROR(thread package $THREADS not yet supported)
     ;;
  *)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 068811485c4..16461c221ac 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,22 @@
 2011-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
+	* gthr-solaris.h: Remove.
+	* gthr.h (_SOLARIS_THREADS): Don't include gthr-solaris.h, remove.
+	* config/sol2.h (CPP_SUBTARGET_SPEC): Remove -threads support.
+	(LIB_SPEC): Likewise.
+	* config/sol2.opt (threads): Remove.
+	* config.gcc (i[34567]86-*-solaris2*): Remove solaris threads
+	support.
+	(sparc*-*-solaris2*): Likewise.
+	* configure.ac (enable_threads): Enable solaris support.
+	* configure: Regenerate.
+	* doc/invoke.texi (Option Summary, Solaris 2 Options): Remove
+	-threads.
+	* doc/install.texi (Configuration, --enable-threads=lib): Remove
+	solaris.
+
+2011-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
 	* config.gcc: Obsolete *-*-solaris2.8*.
 	* doc/install.texi (Specific, *-*-solaris2*): Document it.
 
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 6f920c26ab2..d288e6abbfe 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1426,9 +1426,6 @@ i[34567]86-*-solaris2*)
 	  "":yes:* | yes:yes:* )
 		thread_file=posix
 		;;
-	  "":*:yes | yes:*:yes )
-		thread_file=solaris
-		;;
 	esac
 	;;
 i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
@@ -2603,9 +2600,6 @@ sparc*-*-solaris2*)
 	  "":yes:* | yes:yes:* )
 		thread_file=posix
 		;;
-	  "":*:yes | yes:*:yes )
-		thread_file=solaris
-		;;
 	esac
 	;;
 sparc-wrs-vxworks)
diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h
index 7d081c6d40b..7e42ddb6a4b 100644
--- a/gcc/config/sol2.h
+++ b/gcc/config/sol2.h
@@ -80,7 +80,6 @@ along with GCC; see the file COPYING3.  If not see
 #undef CPP_SUBTARGET_SPEC
 #define CPP_SUBTARGET_SPEC "\
 %{pthreads|pthread:-D_REENTRANT -D_PTHREADS} \
-%{!pthreads:%{!pthread:%{threads:-D_REENTRANT -D_SOLARIS_THREADS}}} \
 %{compat-bsd:-iwithprefixbefore ucbinclude -I/usr/ucbinclude} \
 "
 
@@ -134,8 +133,6 @@ along with GCC; see the file COPYING3.  If not see
    %{!symbolic:\
      %{pthreads|pthread:" \
         LIB_THREAD_LDFLAGS_SPEC " -lpthread " LIB_TLS_SPEC "} \
-     %{!pthreads:%{!pthread:%{threads:" \
-	LIB_THREAD_LDFLAGS_SPEC " -lthread}}} \
      %{p|pg:-ldl} -lc}"
 
 #undef  ENDFILE_SPEC
diff --git a/gcc/config/sol2.opt b/gcc/config/sol2.opt
index c1a78cb028d..e600111a282 100644
--- a/gcc/config/sol2.opt
+++ b/gcc/config/sol2.opt
@@ -42,6 +42,3 @@ Driver
 
 rdynamic
 Driver
-
-threads
-Driver
diff --git a/gcc/configure b/gcc/configure
index 23fa91304c2..60cf9536cd0 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10790,7 +10790,7 @@ case ${enable_threads} in
     target_thread_file='single'
     ;;
   aix | dce | gnat | irix | posix | posix95 | rtems | \
-  single | solaris | vxworks | win32 | mipssde)
+  single | vxworks | win32 | mipssde)
     target_thread_file=${enable_threads}
     ;;
   *)
diff --git a/gcc/configure.ac b/gcc/configure.ac
index adca466fe8f..6862592faf5 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1332,7 +1332,7 @@ case ${enable_threads} in
     target_thread_file='single'
     ;;
   aix | dce | gnat | irix | posix | posix95 | rtems | \
-  single | solaris | vxworks | win32 | mipssde)
+  single | vxworks | win32 | mipssde)
     target_thread_file=${enable_threads}
     ;;
   *)
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index c7036453f15..a79208f91f3 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -1129,9 +1129,6 @@ Generic POSIX/Unix95 thread support.
 RTEMS thread support.
 @item single
 Disable thread support, should work for all platforms.
-@item solaris
-Sun Solaris 2/Unix International thread support.  Only use this if you
-really need to use this legacy API instead of the default, @samp{posix}.
 @item vxworks
 VxWorks thread support.
 @item win32
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index d27704076a4..5b176b747c4 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -854,7 +854,7 @@ See RS/6000 and PowerPC Options.
 
 @emph{Solaris 2 Options}
 @gccoptlist{-mimpure-text  -mno-impure-text @gol
--threads -pthreads -pthread}
+-pthreads -pthread}
 
 @emph{SPARC Options}
 @gccoptlist{-mcpu=@var{cpu-type} @gol
@@ -16931,13 +16931,6 @@ using @option{-mimpure-text}, you should compile all source code with
 These switches are supported in addition to the above on Solaris 2:
 
 @table @gcctabopt
-@item -threads
-@opindex threads
-Add support for multithreading using the Solaris threads library.  This
-option sets flags for both the preprocessor and linker.  This option does
-not affect the thread safety of object code produced by the compiler or
-that of libraries supplied with it.
-
 @item -pthreads
 @opindex pthreads
 Add support for multithreading using the POSIX threads library.  This
diff --git a/gcc/gthr-solaris.h b/gcc/gthr-solaris.h
deleted file mode 100644
index 5aed7ad0dfd..00000000000
--- a/gcc/gthr-solaris.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/* Threads compatibility routines for libgcc2 and libobjc.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1999, 2000, 2004, 2005, 2006, 2008, 2009
-   Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 3, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-Under Section 7 of GPL version 3, you are granted additional
-permissions described in the GCC Runtime Library Exception, version
-3.1, as published by the Free Software Foundation.
-
-You should have received a copy of the GNU General Public License and
-a copy of the GCC Runtime Library Exception along with this program;
-see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef GCC_GTHR_SOLARIS_H
-#define GCC_GTHR_SOLARIS_H
-
-/* Solaris threads as found in Solaris 2.[456].
-   Actually these are Unix International (UI) threads, but I don't
-   know if anyone else implements these.  */
-
-#define __GTHREADS 1
-
-#include <thread.h>
-#include <errno.h>
-
-#ifdef __cplusplus
-#define UNUSED(x)
-#else
-#define UNUSED(x) x __attribute__((unused))
-#endif
-
-typedef thread_key_t __gthread_key_t;
-typedef struct {
-  mutex_t mutex;
-  int once;
-} __gthread_once_t;
-typedef mutex_t __gthread_mutex_t;
-
-typedef struct {
-  long depth;
-  thread_t owner;
-  mutex_t actual;
-} __gthread_recursive_mutex_t;
-
-#define __GTHREAD_ONCE_INIT { DEFAULTMUTEX, 0 }
-#define __GTHREAD_MUTEX_INIT DEFAULTMUTEX
-#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
-
-#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
-# define __gthrw(name) \
-  static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
-# define __gthrw_(name) __gthrw_ ## name
-#else
-# define __gthrw(name)
-# define __gthrw_(name) name
-#endif
-
-__gthrw(thr_keycreate)
-__gthrw(thr_getspecific)
-__gthrw(thr_setspecific)
-__gthrw(thr_create)
-__gthrw(thr_self)
-
-__gthrw(mutex_init)
-__gthrw(mutex_destroy)
-__gthrw(mutex_lock)
-__gthrw(mutex_trylock)
-__gthrw(mutex_unlock)
-
-#ifdef _LIBOBJC
-__gthrw(thr_exit)
-__gthrw(thr_getprio)
-__gthrw(thr_setprio)
-__gthrw(thr_yield)
-
-__gthrw(cond_init)
-__gthrw(cond_destroy)
-__gthrw(cond_wait)
-__gthrw(cond_broadcast)
-__gthrw(cond_signal)
-
-#endif
-
-#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
-
-/* This will not actually work in Solaris 2.5, since libc contains
-   dummy symbols of all thr_* routines.  */
-
-static inline int
-__gthread_active_p (void)
-{
-  static void *const __gthread_active_ptr
-    = __extension__ (void *) &__gthrw_(thr_create);
-  return __gthread_active_ptr != 0;
-}
-
-#else /* not SUPPORTS_WEAK */
-
-static inline int
-__gthread_active_p (void)
-{
-  return 1;
-}
-
-#endif /* SUPPORTS_WEAK */
-
-#ifdef _LIBOBJC
-
-/* Key structure for maintaining thread specific storage */
-static thread_key_t _objc_thread_storage;
-
-/* Thread local storage for a single thread */
-static void *thread_local_storage = NULL;
-
-/* Backend initialization functions */
-
-/* Initialize the threads subsystem.  */
-static inline int
-__gthread_objc_init_thread_system (void)
-{
-  /* Initialize the thread storage key.  */
-  if (__gthread_active_p ()
-      && __gthrw_(thr_keycreate) (&_objc_thread_storage, NULL) == 0)
-    return 0;
-
-  return -1;
-}
-
-/* Close the threads subsystem.  */
-static inline int
-__gthread_objc_close_thread_system (void)
-{
-  if (__gthread_active_p ())
-    return 0;
-  else
-    return -1;
-}
-
-/* Backend thread functions */
-
-/* Create a new thread of execution.  */
-static inline objc_thread_t
-__gthread_objc_thread_detach (void (*func)(void *), void *arg)
-{
-  objc_thread_t thread_id;
-  thread_t new_thread_id = 0;
-
-  if (!__gthread_active_p ())
-    return NULL;
-
-  if (__gthrw_(thr_create) (NULL, 0, (void *) func, arg,
-		  THR_DETACHED | THR_NEW_LWP,
-		  &new_thread_id) == 0)
-    thread_id = *(objc_thread_t *) &new_thread_id;
-  else
-    thread_id = NULL;
-
-  return thread_id;
-}
-
-/* Set the current thread's priority.  */
-static inline int
-__gthread_objc_thread_set_priority (int priority)
-{
-  int sys_priority = 0;
-
-  if (!__gthread_active_p ())
-    return -1;
-
-  switch (priority)
-    {
-    case OBJC_THREAD_INTERACTIVE_PRIORITY:
-      sys_priority = 300;
-      break;
-    default:
-    case OBJC_THREAD_BACKGROUND_PRIORITY:
-      sys_priority = 200;
-      break;
-    case OBJC_THREAD_LOW_PRIORITY:
-      sys_priority = 1000;
-      break;
-    }
-
-  /* Change priority */
-  if (__gthrw_(thr_setprio) (__gthrw_(thr_self) (), sys_priority) == 0)
-    return 0;
-  else
-    return -1;
-}
-
-/* Return the current thread's priority.  */
-static inline int
-__gthread_objc_thread_get_priority (void)
-{
-  int sys_priority;
-
-  if (!__gthread_active_p ())
-    return OBJC_THREAD_INTERACTIVE_PRIORITY;
-
-  if (__gthrw_(thr_getprio) (__gthrw_(thr_self) (), &sys_priority) == 0)
-    {
-      if (sys_priority >= 250)
-	return OBJC_THREAD_INTERACTIVE_PRIORITY;
-      else if (sys_priority >= 150)
-	return OBJC_THREAD_BACKGROUND_PRIORITY;
-      return OBJC_THREAD_LOW_PRIORITY;
-    }
-
-  /* Couldn't get priority.  */
-  return -1;
-}
-
-/* Yield our process time to another thread.  */
-static inline void
-__gthread_objc_thread_yield (void)
-{
-  if (__gthread_active_p ())
-    __gthrw_(thr_yield) ();
-}
-
-/* Terminate the current thread.  */
-static inline int
-__gthread_objc_thread_exit (void)
-{
-  if (__gthread_active_p ())
-    /* exit the thread */
-    __gthrw_(thr_exit) (&__objc_thread_exit_status);
-
-  /* Failed if we reached here */
-  return -1;
-}
-
-/* Returns an integer value which uniquely describes a thread.  */
-static inline objc_thread_t
-__gthread_objc_thread_id (void)
-{
-  if (__gthread_active_p ())
-    return (objc_thread_t) __gthrw_(thr_self) ();
-  else
-    return (objc_thread_t) 1;
-}
-
-/* Sets the thread's local storage pointer.  */
-static inline int
-__gthread_objc_thread_set_data (void *value)
-{
-  if (__gthread_active_p ())
-    {
-      if (__gthrw_(thr_setspecific) (_objc_thread_storage, value) == 0)
-	return 0;
-      else
-	return -1;
-    }
-  else
-    {
-      thread_local_storage = value;
-      return 0;
-    }
-}
-
-/* Returns the thread's local storage pointer.  */
-static inline void *
-__gthread_objc_thread_get_data (void)
-{
-  void *value = NULL;
-
-  if (__gthread_active_p ())
-    {
-      if (__gthrw_(thr_getspecific) (_objc_thread_storage, &value) == 0)
-	return value;
-      else
-	return NULL;
-    }
-  else
-    return thread_local_storage;
-}
-
-/* Backend mutex functions */
-
-/* Allocate a mutex.  */
-static inline int
-__gthread_objc_mutex_allocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(mutex_init) ((mutex_t *) (&(mutex->backend)), USYNC_THREAD, 0))
-    return -1;
-
-  return 0;
-}
-
-/* Deallocate a mutex.  */
-static inline int
-__gthread_objc_mutex_deallocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    __gthrw_(mutex_destroy) ((mutex_t *) (&(mutex->backend)));
-
-  return 0;
-}
-
-/* Grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_lock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(mutex_lock) ((mutex_t *) (&(mutex->backend))) != 0)
-    return -1;
-
-  return 0;
-}
-
-/* Try to grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_trylock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(mutex_trylock) ((mutex_t *) (&(mutex->backend))) != 0)
-    return -1;
-
-  return 0;
-}
-
-/* Unlock the mutex */
-static inline int
-__gthread_objc_mutex_unlock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && __gthrw_(mutex_unlock) ((mutex_t *) (&(mutex->backend))) != 0)
-    return -1;
-
-  return 0;
-}
-
-/* Backend condition mutex functions */
-
-/* Allocate a condition.  */
-static inline int
-__gthread_objc_condition_allocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(cond_init) ((cond_t *) (&(condition->backend)), USYNC_THREAD,
-		      NULL);
-  else
-    return 0;
-}
-
-/* Deallocate a condition.  */
-static inline int
-__gthread_objc_condition_deallocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(cond_destroy) ((cond_t *) (&(condition->backend)));
-  else
-    return 0;
-}
-
-/* Wait on the condition */
-static inline int
-__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(cond_wait) ((cond_t *) (&(condition->backend)),
-		      (mutex_t *) (&(mutex->backend)));
-  else
-    return 0;
-}
-
-/* Wake up all threads waiting on this condition.  */
-static inline int
-__gthread_objc_condition_broadcast (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(cond_broadcast) ((cond_t *) (&(condition->backend)));
-  else
-    return 0;
-}
-
-/* Wake up one thread waiting on this condition.  */
-static inline int
-__gthread_objc_condition_signal (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(cond_signal) ((cond_t *) (&(condition->backend)));
-  else
-    return 0;
-}
-
-#else /* _LIBOBJC */
-
-static inline int
-__gthread_once (__gthread_once_t *__once, void (*__func) (void))
-{
-  if (! __gthread_active_p ())
-    return -1;
-
-  if (__once == 0 || __func == 0)
-    return EINVAL;
-
-  if (__once->once == 0)
-    {
-      int __status = __gthrw_(mutex_lock) (&__once->mutex);
-      if (__status != 0)
-	return __status;
-      if (__once->once == 0)
-	{
-	  (*__func) ();
-	  __once->once++;
-	}
-      __gthrw_(mutex_unlock) (&__once->mutex);
-    }
-  return 0;
-}
-
-static inline int
-__gthread_key_create (__gthread_key_t *__key, void (*__dtor) (void *))
-{
-  /* Solaris 2.5 contains thr_* routines no-op in libc, so test if we actually
-     got a reasonable key value, and if not, fail.  */
-  *__key = (__gthread_key_t)-1;
-  if (__gthrw_(thr_keycreate) (__key, __dtor) != 0
-      || *__key == (__gthread_key_t)-1)
-    return -1;
-  else
-    return 0;
-}
-
-static inline int
-__gthread_key_delete (__gthread_key_t UNUSED (__key))
-{
-  /* Not possible.  */
-  return -1;
-}
-
-static inline void *
-__gthread_getspecific (__gthread_key_t __key)
-{
-  void *__ptr;
-  if (__gthrw_(thr_getspecific) (__key, &__ptr) == 0)
-    return __ptr;
-  else
-    return 0;
-}
-
-static inline int
-__gthread_setspecific (__gthread_key_t __key, const void *__ptr)
-{
-  return __gthrw_(thr_setspecific) (__key, (void *) __ptr);
-}
-
-static inline int
-__gthread_mutex_destroy (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(mutex_destroy) (__mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_lock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(mutex_lock) (__mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(mutex_trylock) (__mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    return __gthrw_(mutex_unlock) (__mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
-{
-  __mutex->depth = 0;
-  __mutex->owner = (thread_t) 0;
-  return __gthrw_(mutex_init) (&__mutex->actual, USYNC_THREAD, 0);
-}
-
-static inline int
-__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    {
-      thread_t __me = __gthrw_(thr_self) ();
-
-      if (__mutex->owner != __me)
-	{
-	  __gthrw_(mutex_lock) (&__mutex->actual);
-	  __mutex->owner = __me;
-	}
-
-      __mutex->depth++;
-    }
-  return 0;
-}
-
-static inline int
-__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    {
-      thread_t __me = __gthrw_(thr_self) ();
-
-      if (__mutex->owner != __me)
-	{
-	  if (__gthrw_(mutex_trylock) (&__mutex->actual))
-	    return 1;
-	  __mutex->owner = __me;
-	}
-
-      __mutex->depth++;
-    }
-  return 0;
-}
-
-static inline int
-__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
-{
-  if (__gthread_active_p ())
-    {
-      if (--__mutex->depth == 0)
-	{
-	   __mutex->owner = (thread_t) 0;
-	   __gthrw_(mutex_unlock) (&__mutex->actual);
-	}
-    }
-  return 0;
-}
-
-#endif /* _LIBOBJC */
-
-#undef UNUSED
-
-#endif /* ! GCC_GTHR_SOLARIS_H */
diff --git a/gcc/gthr.h b/gcc/gthr.h
index 6edfbcd69c3..0752f893c4f 100644
--- a/gcc/gthr.h
+++ b/gcc/gthr.h
@@ -1,6 +1,7 @@
 /* Threads compatibility routines for libgcc2.  */
 /* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1998, 2004, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2004, 2008, 2009, 2011
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -136,7 +137,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
      POSIX/Unix98 threads with -D_PTHREADS
      POSIX/Unix95 threads with -D_PTHREADS95
      DCE threads with -D_DCE_THREADS
-     Solaris/UI threads with -D_SOLARIS_THREADS
 
 */
 
@@ -149,8 +149,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include "gthr-posix95.h"
 #elif _DCE_THREADS
 #include "gthr-dce.h"
-#elif _SOLARIS_THREADS
-#include "gthr-solaris.h"
 
 /* Include GTHREAD_FILE if one is defined.  */
 #elif defined(HAVE_GTHR_DEFAULT)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 21eeee54943..9252da250c5 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
 2011-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
+	* configure.ac (THREADS): Remove solaris.
+	* configure: Regenerate.
+
+2011-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
 	PR bootstrap/48135
 	* configure.ac (libjava_cv_anon_version_script): Handle
 	--disable-symvers.
diff --git a/libjava/configure b/libjava/configure
index 2a57e13af57..62c4706eb68 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -20688,7 +20688,7 @@ $as_echo "#define LINUX_THREADS 1" >>confdefs.h
     ;;
  win32)
     ;;
- decosf1 | irix | mach | os2 | solaris | dce | vxworks)
+ decosf1 | irix | mach | os2 | dce | vxworks)
     as_fn_error "thread package $THREADS not yet supported" "$LINENO" 5
     ;;
  *)
diff --git a/libjava/configure.ac b/libjava/configure.ac
index c5bb1a04f98..3a29a492e39 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1033,7 +1033,7 @@ case "$THREADS" in
     ;;
  win32)
     ;;
- decosf1 | irix | mach | os2 | solaris | dce | vxworks)
+ decosf1 | irix | mach | os2 | dce | vxworks)
     AC_MSG_ERROR(thread package $THREADS not yet supported)
     ;;
  *)