PATCH: Enable POSIX threads for IRIX 6 (take 2)

H . J . Lu hjl@lucon.org
Wed Aug 29 09:44:00 GMT 2001


On Tue, Aug 14, 2001 at 11:21:18PM -0700, H . J . Lu wrote:
> On Wed, Aug 15, 2001 at 03:05:53AM -0300, Alexandre Oliva wrote:
> > On Aug 15, 2001, "H . J . Lu" <hjl@lucon.org> wrote:
> > 
> > > On Wed, Aug 15, 2001 at 02:54:49AM -0300, Alexandre Oliva wrote:
> > >> On Aug 15, 2001, "H . J . Lu" <hjl@lucon.org> wrote:
> > >> 
> > >> > Unfortunately, I cannot test multilib since my Irix 6.5 is 32bit.
> > >> > Someone else has to modify my patch and test it.
> > >> 
> > >> You could at least supply such a person with a corrected patch :-)  Or
> > >> use an embedded multilibbed target to try the patch.
> > 
> > > Well, I have to leave that to people who need it.
> > 
> > Well, then your patch won't get it because it is clearly wrong.
> > 
> 
> Irix is not my target. I just want to help out. If noone else cares
> about Irix, I guess gcc will eventually die on Irix.
> 

Here is an untested patch with multilib support.


H.J.
----
2001-08-29  H.J. Lu <hjl@gnu.org>

	* config.gcc (pthread_active_function): Set to `pthread_once'
	for `mips-sgi-irix6*'.
	(thread_file): Set to `posix' for `mips-sgi-irix6*' if the
	thread support is enabled.

	* configure.in (pthread_active_function): Set to
	`pthread_create' by default. Add to AC_SUBST.
	(all_outputs): Add gthr-posix.h.
	* configure: Regenerated.

	* cppinit.c (init_builtins): Check SUPPORTS_WEAK instead of
	SUPPORTS_ONE_ONLY for __GXX_WEAK__.

	* gthr-posix.h: Moved to ...
	* gthr-posix.h.in: Here.

	* gthr-posix.h.in (__gthread_active_ptr): Initiliazed with
	@pthread_active_function@.

2001-08-29  H.J. Lu <hjl@gnu.org>

	* include/Makefile.am (MULTIBUILDTOP): Defined.
	(${thread_builddir}/gthr-default.h): Try
	$(MULTIBUILDTOP)../../../gcc/${glibcpp_thread_h} first.
	* include/Makefile.in: Regenerated.

--- gcc/gcc/config.gcc.pthread	Wed Aug 29 09:06:33 2001
+++ gcc/gcc/config.gcc	Wed Aug 29 09:06:33 2001
@@ -2040,9 +2040,10 @@ mips-sgi-irix6*)		# SGI System V.4., IRI
 	tmake_file=mips/t-iris6
 	xm_defines=POSIX
 	xmake_file=mips/x-iris6
-#	if test x$enable_threads = xyes; then
-#		thread_file='irix'
-#	fi
+	pthread_active_function=pthread_once
+	if test x$enable_threads = xyes; then
+		thread_file='posix'
+	fi
 	;;
 mips-wrs-vxworks)
 	tm_file="mips/elf.h mips/vxworks.h"
--- gcc/gcc/configure.in.pthread	Sat Aug 25 08:25:27 2001
+++ gcc/gcc/configure.in	Wed Aug 29 09:06:33 2001
@@ -691,6 +691,7 @@ host_xm_defines=
 host_xmake_file=
 host_truncate_target=
 host_exeext=
+pthread_active_function=pthread_create
 
 # Decode the host machine, then the target machine.
 # For the host machine, we save the xm_file variable as host_xm_file;
@@ -700,6 +701,8 @@ for machine in $build $host $target; do
 	. ${srcdir}/config.gcc
 done
 
+AC_SUBST(pthread_active_function)
+
 extra_objs="${host_extra_objs} ${extra_objs}"
 
 # Default the target-machine variables that were not explicitly set.
@@ -1859,7 +1862,7 @@ all_boot_languages=
 all_compilers=
 all_stagestuff=
 all_diff_excludes=
-all_outputs='Makefile intl/Makefile po/Makefile.in fixinc/Makefile gccbug mklibgcc'
+all_outputs='Makefile intl/Makefile po/Makefile.in fixinc/Makefile gccbug mklibgcc gthr-posix.h'
 # List of language makefile fragments.
 all_lang_makefiles=
 all_headers=
--- gcc/gcc/cppinit.c.pthread	Sat Aug 25 08:25:27 2001
+++ gcc/gcc/cppinit.c	Wed Aug 29 09:06:33 2001
@@ -751,7 +751,7 @@ init_builtins (pfile)
   if (CPP_OPTION (pfile, cplusplus))
     {
       _cpp_define_builtin (pfile, "__cplusplus 1");
-      if (SUPPORTS_ONE_ONLY)
+      if (SUPPORTS_WEAK)
 	_cpp_define_builtin (pfile, "__GXX_WEAK__ 1");
       else
 	_cpp_define_builtin (pfile, "__GXX_WEAK__ 0");
--- gcc/gcc/gthr-posix.h.in.pthread	Wed Aug 29 09:06:33 2001
+++ gcc/gcc/gthr-posix.h.in	Wed Aug 29 09:06:33 2001
@@ -0,0 +1,510 @@
+/* Threads compatibility routines for libgcc2 and libobjc.  */
+/* Compile this one with gcc.  */
+/* Copyright (C) 1997, 1999, 2000, 2001 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 2, 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.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
+
+/* As a special exception, if you link this library with other files,
+   some of which are compiled with GCC, to produce an executable,
+   this library does not by itself cause the resulting executable
+   to be covered by the GNU General Public License.
+   This exception does not however invalidate any other reasons why
+   the executable file might be covered by the GNU General Public License.  */
+
+#ifndef GCC_GTHR_POSIX_H
+#define GCC_GTHR_POSIX_H
+
+/* POSIX threads specific definitions.
+   Easy, since the interface is just one-to-one mapping. */
+
+#define __GTHREADS 1
+
+#include <pthread.h>
+
+typedef pthread_key_t __gthread_key_t;
+typedef pthread_once_t __gthread_once_t;
+typedef pthread_mutex_t __gthread_mutex_t;
+
+#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
+#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
+
+#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+
+#pragma weak pthread_once
+#pragma weak pthread_key_create
+#pragma weak pthread_key_delete
+#pragma weak pthread_getspecific
+#pragma weak pthread_setspecific
+#pragma weak pthread_create
+
+#pragma weak pthread_mutex_lock 
+#pragma weak pthread_mutex_trylock 
+#pragma weak pthread_mutex_unlock 
+
+#ifdef _LIBOBJC
+/* Objective C. */
+#pragma weak pthread_cond_broadcast
+#pragma weak pthread_cond_destroy
+#pragma weak pthread_cond_init
+#pragma weak pthread_cond_signal
+#pragma weak pthread_cond_wait
+#pragma weak pthread_exit
+#pragma weak pthread_mutex_init
+#pragma weak pthread_mutex_destroy
+#pragma weak pthread_self
+#pragma weak sched_get_priority_max
+#pragma weak sched_get_priority_min
+#pragma weak sched_yield
+#pragma weak pthread_attr_destroy
+#pragma weak pthread_attr_init
+#pragma weak pthread_attr_setdetachstate
+#pragma weak pthread_getschedparam
+#pragma weak pthread_setschedparam
+#endif
+
+static void *__gthread_active_ptr = (void *) &@pthread_active_function@;
+
+static inline int
+__gthread_active_p (void)
+{
+  return __gthread_active_ptr != 0;
+}
+
+#else /* not SUPPORTS_WEAK */
+
+static inline int
+__gthread_active_p (void)
+{
+  return 1;
+}
+
+#endif /* SUPPORTS_WEAK */
+
+#ifdef _LIBOBJC
+
+/* This is the config.h file in libobjc/ */
+#include <config.h>
+
+#ifdef HAVE_SCHED_H
+# include <sched.h>
+#endif
+
+/* Key structure for maintaining thread specific storage */
+static pthread_key_t _objc_thread_storage;
+static pthread_attr_t _objc_thread_attribs;
+
+/* 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)
+{
+  if (__gthread_active_p ())
+    {
+      /* Initialize the thread storage key */
+      if (pthread_key_create(&_objc_thread_storage, NULL) == 0)
+        {
+          /* The normal default detach state for threads is
+           * PTHREAD_CREATE_JOINABLE which causes threads to not die
+           * when you think they should.  */
+          if (pthread_attr_init(&_objc_thread_attribs) == 0
+              && pthread_attr_setdetachstate(&_objc_thread_attribs, 
+                                             PTHREAD_CREATE_DETACHED) == 0)
+            return 0;
+        }
+    }
+
+  return -1;
+}
+
+/* Close the threads subsystem. */
+static inline int
+__gthread_objc_close_thread_system(void)
+{
+  if (__gthread_active_p ()
+      && pthread_key_delete(_objc_thread_storage) == 0
+      && pthread_attr_destroy(&_objc_thread_attribs) == 0)
+    return 0;
+
+  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;
+  pthread_t new_thread_handle;
+
+  if (!__gthread_active_p ())
+    return NULL;
+ 
+  if ( !(pthread_create(&new_thread_handle, NULL, (void *)func, arg)) )
+    thread_id = (objc_thread_t) new_thread_handle;
+  else
+    thread_id = NULL;
+  
+  return thread_id;
+}
+
+/* Set the current thread's priority. */
+static inline int
+__gthread_objc_thread_set_priority(int priority)
+{
+  if (!__gthread_active_p())
+    return -1;
+  else {
+    pthread_t thread_id = pthread_self();
+    int policy;
+    struct sched_param params;
+    int priority_min, priority_max;
+
+    if (pthread_getschedparam(thread_id, &policy, &params) == 0)
+      {
+        if ((priority_max = sched_get_priority_max(policy)) != 0)
+          return -1;
+
+        if ((priority_min = sched_get_priority_min(policy)) != 0)
+          return -1;
+
+        if (priority > priority_max)
+          priority = priority_max;
+        else if (priority < priority_min)
+          priority = priority_min;
+        params.sched_priority = priority;
+
+        /*
+         * The solaris 7 and several other man pages incorrectly state that
+         * this should be a pointer to policy but pthread.h is universally
+         * at odds with this.
+         */
+        if (pthread_setschedparam(thread_id, policy, &params) == 0)
+          return 0;
+      }
+    return -1;
+  }
+}
+
+/* Return the current thread's priority. */
+static inline int
+__gthread_objc_thread_get_priority(void)
+{
+  if (__gthread_active_p ())
+    {
+      int policy;
+      struct sched_param params;
+
+      if (pthread_getschedparam(pthread_self(), &policy, &params) == 0)
+        return params.sched_priority;
+      else
+        return -1;
+    }
+  else
+    return OBJC_THREAD_INTERACTIVE_PRIORITY;
+}
+
+/* Yield our process time to another thread. */
+static inline void
+__gthread_objc_thread_yield(void)
+{
+  if (__gthread_active_p ())
+    sched_yield();
+}
+
+/* Terminate the current thread. */
+static inline int
+__gthread_objc_thread_exit(void)
+{
+  if (__gthread_active_p ())
+    /* exit the thread */
+    pthread_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) pthread_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 ())
+    return pthread_setspecific(_objc_thread_storage, value);
+  else
+    {
+      thread_local_storage = value;
+      return 0;
+    }
+}
+
+/* Returns the thread's local storage pointer. */
+static inline void *
+__gthread_objc_thread_get_data(void)
+{
+  if (__gthread_active_p ())
+    return pthread_getspecific(_objc_thread_storage);
+  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 ())
+    {
+      mutex->backend = objc_malloc(sizeof(pthread_mutex_t));
+
+      if (pthread_mutex_init((pthread_mutex_t *)mutex->backend, NULL))
+	{
+	  objc_free(mutex->backend);
+	  mutex->backend = NULL;
+	  return -1;
+	}
+    }
+
+  return 0;
+}
+
+/* Deallocate a mutex. */
+static inline int
+__gthread_objc_mutex_deallocate(objc_mutex_t mutex)
+{
+  if (__gthread_active_p ())
+    {
+      int count;
+
+      /*
+       * Posix Threads specifically require that the thread be unlocked
+       * for pthread_mutex_destroy to work.
+       */
+
+      do
+	{
+	  count = pthread_mutex_unlock((pthread_mutex_t *)mutex->backend);
+	  if (count < 0)
+	    return -1;
+	}
+      while (count);
+
+      if (pthread_mutex_destroy((pthread_mutex_t *)mutex->backend))
+	return -1;
+
+      objc_free(mutex->backend);
+      mutex->backend = NULL;
+    }
+  return 0;
+}
+
+/* Grab a lock on a mutex. */
+static inline int
+__gthread_objc_mutex_lock(objc_mutex_t mutex)
+{
+  if (__gthread_active_p () 
+      && pthread_mutex_lock((pthread_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 () 
+      && pthread_mutex_trylock((pthread_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 () 
+      && pthread_mutex_unlock((pthread_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 ())
+    {
+      condition->backend = objc_malloc(sizeof(pthread_cond_t));
+
+      if (pthread_cond_init((pthread_cond_t *)condition->backend, NULL))
+	{
+	  objc_free(condition->backend);
+	  condition->backend = NULL;
+	  return -1;
+	}
+    }
+
+  return 0;
+}
+
+/* Deallocate a condition. */
+static inline int
+__gthread_objc_condition_deallocate(objc_condition_t condition)
+{
+  if (__gthread_active_p ())
+    {
+      if (pthread_cond_destroy((pthread_cond_t *)condition->backend))
+	return -1;
+
+      objc_free(condition->backend);
+      condition->backend = NULL;
+    }
+  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 pthread_cond_wait((pthread_cond_t *)condition->backend,
+			   (pthread_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 pthread_cond_broadcast((pthread_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 pthread_cond_signal((pthread_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 pthread_once (once, func);
+  else
+    return -1;
+}
+
+static inline int
+__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
+{
+  return pthread_key_create (key, dtor);
+}
+
+static inline int
+__gthread_key_dtor (__gthread_key_t key, void *ptr)
+{
+  /* Just reset the key value to zero. */
+  if (ptr)
+    return pthread_setspecific (key, 0);
+  else
+    return 0;
+}
+
+static inline int
+__gthread_key_delete (__gthread_key_t key)
+{
+  return pthread_key_delete (key);
+}
+
+static inline void *
+__gthread_getspecific (__gthread_key_t key)
+{
+  return pthread_getspecific (key);
+}
+
+static inline int
+__gthread_setspecific (__gthread_key_t key, const void *ptr)
+{
+  return pthread_setspecific (key, ptr);
+}
+
+static inline int
+__gthread_mutex_lock (__gthread_mutex_t *mutex)
+{
+  if (__gthread_active_p ())
+    return pthread_mutex_lock (mutex);
+  else
+    return 0;
+}
+
+static inline int
+__gthread_mutex_trylock (__gthread_mutex_t *mutex)
+{
+  if (__gthread_active_p ())
+    return pthread_mutex_trylock (mutex);
+  else
+    return 0;
+}
+
+static inline int
+__gthread_mutex_unlock (__gthread_mutex_t *mutex)
+{
+  if (__gthread_active_p ())
+    return pthread_mutex_unlock (mutex);
+  else
+    return 0;
+}
+
+#endif /* _LIBOBJC */
+
+#endif /* ! GCC_GTHR_POSIX_H */
--- gcc/gcc/gthr-posix.h.pthread	Sat Aug 25 08:25:35 2001
+++ gcc/gcc/gthr-posix.h	Wed Aug 29 09:35:51 2001
@@ -1,510 +0,0 @@
-/* Threads compatibility routines for libgcc2 and libobjc.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1999, 2000, 2001 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 2, 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.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef GCC_GTHR_POSIX_H
-#define GCC_GTHR_POSIX_H
-
-/* POSIX threads specific definitions.
-   Easy, since the interface is just one-to-one mapping. */
-
-#define __GTHREADS 1
-
-#include <pthread.h>
-
-typedef pthread_key_t __gthread_key_t;
-typedef pthread_once_t __gthread_once_t;
-typedef pthread_mutex_t __gthread_mutex_t;
-
-#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
-#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-
-#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
-
-#pragma weak pthread_once
-#pragma weak pthread_key_create
-#pragma weak pthread_key_delete
-#pragma weak pthread_getspecific
-#pragma weak pthread_setspecific
-#pragma weak pthread_create
-
-#pragma weak pthread_mutex_lock 
-#pragma weak pthread_mutex_trylock 
-#pragma weak pthread_mutex_unlock 
-
-#ifdef _LIBOBJC
-/* Objective C. */
-#pragma weak pthread_cond_broadcast
-#pragma weak pthread_cond_destroy
-#pragma weak pthread_cond_init
-#pragma weak pthread_cond_signal
-#pragma weak pthread_cond_wait
-#pragma weak pthread_exit
-#pragma weak pthread_mutex_init
-#pragma weak pthread_mutex_destroy
-#pragma weak pthread_self
-#pragma weak sched_get_priority_max
-#pragma weak sched_get_priority_min
-#pragma weak sched_yield
-#pragma weak pthread_attr_destroy
-#pragma weak pthread_attr_init
-#pragma weak pthread_attr_setdetachstate
-#pragma weak pthread_getschedparam
-#pragma weak pthread_setschedparam
-#endif
-
-static void *__gthread_active_ptr = (void *) &pthread_create;
-
-static inline int
-__gthread_active_p (void)
-{
-  return __gthread_active_ptr != 0;
-}
-
-#else /* not SUPPORTS_WEAK */
-
-static inline int
-__gthread_active_p (void)
-{
-  return 1;
-}
-
-#endif /* SUPPORTS_WEAK */
-
-#ifdef _LIBOBJC
-
-/* This is the config.h file in libobjc/ */
-#include <config.h>
-
-#ifdef HAVE_SCHED_H
-# include <sched.h>
-#endif
-
-/* Key structure for maintaining thread specific storage */
-static pthread_key_t _objc_thread_storage;
-static pthread_attr_t _objc_thread_attribs;
-
-/* 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)
-{
-  if (__gthread_active_p ())
-    {
-      /* Initialize the thread storage key */
-      if (pthread_key_create(&_objc_thread_storage, NULL) == 0)
-        {
-          /* The normal default detach state for threads is
-           * PTHREAD_CREATE_JOINABLE which causes threads to not die
-           * when you think they should.  */
-          if (pthread_attr_init(&_objc_thread_attribs) == 0
-              && pthread_attr_setdetachstate(&_objc_thread_attribs, 
-                                             PTHREAD_CREATE_DETACHED) == 0)
-            return 0;
-        }
-    }
-
-  return -1;
-}
-
-/* Close the threads subsystem. */
-static inline int
-__gthread_objc_close_thread_system(void)
-{
-  if (__gthread_active_p ()
-      && pthread_key_delete(_objc_thread_storage) == 0
-      && pthread_attr_destroy(&_objc_thread_attribs) == 0)
-    return 0;
-
-  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;
-  pthread_t new_thread_handle;
-
-  if (!__gthread_active_p ())
-    return NULL;
- 
-  if ( !(pthread_create(&new_thread_handle, NULL, (void *)func, arg)) )
-    thread_id = (objc_thread_t) new_thread_handle;
-  else
-    thread_id = NULL;
-  
-  return thread_id;
-}
-
-/* Set the current thread's priority. */
-static inline int
-__gthread_objc_thread_set_priority(int priority)
-{
-  if (!__gthread_active_p())
-    return -1;
-  else {
-    pthread_t thread_id = pthread_self();
-    int policy;
-    struct sched_param params;
-    int priority_min, priority_max;
-
-    if (pthread_getschedparam(thread_id, &policy, &params) == 0)
-      {
-        if ((priority_max = sched_get_priority_max(policy)) != 0)
-          return -1;
-
-        if ((priority_min = sched_get_priority_min(policy)) != 0)
-          return -1;
-
-        if (priority > priority_max)
-          priority = priority_max;
-        else if (priority < priority_min)
-          priority = priority_min;
-        params.sched_priority = priority;
-
-        /*
-         * The solaris 7 and several other man pages incorrectly state that
-         * this should be a pointer to policy but pthread.h is universally
-         * at odds with this.
-         */
-        if (pthread_setschedparam(thread_id, policy, &params) == 0)
-          return 0;
-      }
-    return -1;
-  }
-}
-
-/* Return the current thread's priority. */
-static inline int
-__gthread_objc_thread_get_priority(void)
-{
-  if (__gthread_active_p ())
-    {
-      int policy;
-      struct sched_param params;
-
-      if (pthread_getschedparam(pthread_self(), &policy, &params) == 0)
-        return params.sched_priority;
-      else
-        return -1;
-    }
-  else
-    return OBJC_THREAD_INTERACTIVE_PRIORITY;
-}
-
-/* Yield our process time to another thread. */
-static inline void
-__gthread_objc_thread_yield(void)
-{
-  if (__gthread_active_p ())
-    sched_yield();
-}
-
-/* Terminate the current thread. */
-static inline int
-__gthread_objc_thread_exit(void)
-{
-  if (__gthread_active_p ())
-    /* exit the thread */
-    pthread_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) pthread_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 ())
-    return pthread_setspecific(_objc_thread_storage, value);
-  else
-    {
-      thread_local_storage = value;
-      return 0;
-    }
-}
-
-/* Returns the thread's local storage pointer. */
-static inline void *
-__gthread_objc_thread_get_data(void)
-{
-  if (__gthread_active_p ())
-    return pthread_getspecific(_objc_thread_storage);
-  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 ())
-    {
-      mutex->backend = objc_malloc(sizeof(pthread_mutex_t));
-
-      if (pthread_mutex_init((pthread_mutex_t *)mutex->backend, NULL))
-	{
-	  objc_free(mutex->backend);
-	  mutex->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a mutex. */
-static inline int
-__gthread_objc_mutex_deallocate(objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      int count;
-
-      /*
-       * Posix Threads specifically require that the thread be unlocked
-       * for pthread_mutex_destroy to work.
-       */
-
-      do
-	{
-	  count = pthread_mutex_unlock((pthread_mutex_t *)mutex->backend);
-	  if (count < 0)
-	    return -1;
-	}
-      while (count);
-
-      if (pthread_mutex_destroy((pthread_mutex_t *)mutex->backend))
-	return -1;
-
-      objc_free(mutex->backend);
-      mutex->backend = NULL;
-    }
-  return 0;
-}
-
-/* Grab a lock on a mutex. */
-static inline int
-__gthread_objc_mutex_lock(objc_mutex_t mutex)
-{
-  if (__gthread_active_p () 
-      && pthread_mutex_lock((pthread_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 () 
-      && pthread_mutex_trylock((pthread_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 () 
-      && pthread_mutex_unlock((pthread_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 ())
-    {
-      condition->backend = objc_malloc(sizeof(pthread_cond_t));
-
-      if (pthread_cond_init((pthread_cond_t *)condition->backend, NULL))
-	{
-	  objc_free(condition->backend);
-	  condition->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a condition. */
-static inline int
-__gthread_objc_condition_deallocate(objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      if (pthread_cond_destroy((pthread_cond_t *)condition->backend))
-	return -1;
-
-      objc_free(condition->backend);
-      condition->backend = NULL;
-    }
-  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 pthread_cond_wait((pthread_cond_t *)condition->backend,
-			   (pthread_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 pthread_cond_broadcast((pthread_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 pthread_cond_signal((pthread_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 pthread_once (once, func);
-  else
-    return -1;
-}
-
-static inline int
-__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
-{
-  return pthread_key_create (key, dtor);
-}
-
-static inline int
-__gthread_key_dtor (__gthread_key_t key, void *ptr)
-{
-  /* Just reset the key value to zero. */
-  if (ptr)
-    return pthread_setspecific (key, 0);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_key_delete (__gthread_key_t key)
-{
-  return pthread_key_delete (key);
-}
-
-static inline void *
-__gthread_getspecific (__gthread_key_t key)
-{
-  return pthread_getspecific (key);
-}
-
-static inline int
-__gthread_setspecific (__gthread_key_t key, const void *ptr)
-{
-  return pthread_setspecific (key, ptr);
-}
-
-static inline int
-__gthread_mutex_lock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_lock (mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_trylock (mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_unlock (mutex);
-  else
-    return 0;
-}
-
-#endif /* _LIBOBJC */
-
-#endif /* ! GCC_GTHR_POSIX_H */
--- gcc/libstdc++-v3/include/Makefile.am.pthread	Wed Aug 29 08:45:45 2001
+++ gcc/libstdc++-v3/include/Makefile.am	Wed Aug 29 09:27:34 2001
@@ -32,6 +32,7 @@ mkinstalldirs = $(SHELL) $(toplevel_srcd
 CXX = @glibcpp_CXX@
 glibcpp_srcdir=@glibcpp_srcdir@
 glibcpp_builddir=@glibcpp_builddir@
+MULTIBUILDTOP =
 
 bits_srcdir = ${glibcpp_srcdir}/include/bits
 bits_builddir = ./bits
@@ -372,10 +373,15 @@ ${thread_builddir}/gthr-single.h:
 	    < ${toplevel_srcdir}/gcc/gthr-single.h > $@
 
 ${thread_builddir}/gthr-default.h:
+	if test -f $(MULTIBUILDTOP)../../../gcc/${glibcpp_thread_h}; then \
+	  thread_h=$(MULTIBUILDTOP)../../../gcc/${glibcpp_thread_h}; \
+	else \
+	  thread_h=${glibcpp_srcdir}/../gcc/${glibcpp_thread_h}; \
+	fi; \
 	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
 	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
 	    -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
-	    < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
+	    < $$thread_h > $@
 
 # One big happy istallation:  just copy everything from the build to the
 # install tree (except for the build stamps).



More information about the Gcc-patches mailing list