* configure: Rebuilt.

	* configure.in: Removed qt threads case.
	* dyn_load.c: Don't mention QUICK_THREADS.
	* os_dep.c: Don't mention QUICK_THREADS.
	* misc.c: Don't mention QUICK_THREADS.
	* gcconfig.h: Don't mention QUICK_THREADS.
	* gc_priv.h: Removed QUICK_THREADS code.
	* quick_threads.c: Removed.

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

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 7a38769..18726e8 100644 (file)
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,14 @@
+1999-11-04  Tom Tromey  <tromey@cygnus.com>
+
+       * configure: Rebuilt.
+       * configure.in: Removed qt threads case.
+       * dyn_load.c: Don't mention QUICK_THREADS.
+       * os_dep.c: Don't mention QUICK_THREADS.
+       * misc.c: Don't mention QUICK_THREADS.
+       * gcconfig.h: Don't mention QUICK_THREADS.
+       * gc_priv.h: Removed QUICK_THREADS code.
+       * quick_threads.c: Removed.
+
 1999-11-03  Tom Tromey  <tromey@cygnus.com>
 
        * gcconfig.h: Merged in local changes from old config.h.

diff --git a/boehm-gc/configure b/boehm-gc/configure
index ef5960c..1f7f3fc 100755 (executable)
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -2113,14 +2113,6 @@ EOF
     esac
     THREADLIB=-lpthread
     ;;
- qt)
-    cat >> confdefs.h <<\EOF
-#define QUICK_THREADS 1
-EOF
-
-    INCLUDES="-I${boehm_gc_basedir}/../qthreads"
-    THREADLIB=../qthreads/libgcjcoop.la
-    ;;
  decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
     { echo "configure: error: thread package $THREADS not yet supported" 1>&2; exit 1; }
     ;;

diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in
index 0d2331f..f3e875a 100644 (file)
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -84,11 +84,6 @@ case "$THREADS" in
     esac
     THREADLIB=-lpthread
     ;;
- qt)
-    AC_DEFINE(QUICK_THREADS)
-    INCLUDES="-I${boehm_gc_basedir}/../qthreads"
-    THREADLIB=../qthreads/libgcjcoop.la
-    ;;
  decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
     AC_MSG_ERROR(thread package $THREADS not yet supported)
     ;;

diff --git a/boehm-gc/dyn_load.c b/boehm-gc/dyn_load.c
index b9de4c1..8c3ec41 100644 (file)
--- a/boehm-gc/dyn_load.c
+++ b/boehm-gc/dyn_load.c
@@ -161,8 +161,7 @@ static ptr_t GC_first_common()
 
 # if defined(SUNOS4) || defined(SUNOS5DL)
 /* Add dynamic library data sections to the root set.          */
-# if !defined(PCR) && !defined(SOLARIS_THREADS) \
-       && !defined(QUICK_THREADS) && defined(THREADS)
+# if !defined(PCR) && !defined(SOLARIS_THREADS) && defined(THREADS)
 #   ifndef SRC_M3
        --> fix mutual exclusion with dlopen
 #   endif  /* We assume M3 programs don't call dlopen for now */

diff --git a/boehm-gc/gc_priv.h b/boehm-gc/gc_priv.h
index cd554d1..23977d3 100644 (file)
--- a/boehm-gc/gc_priv.h
+++ b/boehm-gc/gc_priv.h
@@ -594,10 +594,6 @@ addr)
 #    define LOCK() EnterCriticalSection(&GC_allocate_ml);
 #    define UNLOCK() LeaveCriticalSection(&GC_allocate_ml);
 #  endif
-#  ifdef QUICK_THREADS
-#    define LOCK()
-#    define UNLOCK()
-#  endif
 #  ifndef SET_LOCK_HOLDER
 #      define SET_LOCK_HOLDER()
 #      define UNSET_LOCK_HOLDER()

diff --git a/boehm-gc/gcconfig.h b/boehm-gc/gcconfig.h
index b286266..899b8d3 100644 (file)
--- a/boehm-gc/gcconfig.h
+++ b/boehm-gc/gcconfig.h
@@ -1186,8 +1186,7 @@
 # if defined(PCR) || defined(SRC_M3) || \
        defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || \
        defined(IRIX_THREADS) || defined(LINUX_THREADS) || \
-       defined(IRIX_JDK_THREADS) || defined(HPUX_THREADS) || \
-       defined(QUICK_THREADS)
+       defined(IRIX_JDK_THREADS) || defined(HPUX_THREADS)
 #   define THREADS
 # endif
 

diff --git a/boehm-gc/misc.c b/boehm-gc/misc.c
index 348d08a..5bbaafa 100644 (file)
--- a/boehm-gc/misc.c
+++ b/boehm-gc/misc.c
@@ -49,11 +49,7 @@
 #              if defined(HPUX_THREADS)
                  pthread_mutex_t GC_allocate_ml = PTHREAD_MUTEX_INITIALIZER;
 #              else 
-#                 if defined(QUICK_THREADS)
-                               /* Nothing */
-#                 else
                  --> declare allocator lock here
-#                 endif
 #              endif
 #            endif
 #         endif
@@ -469,7 +465,7 @@ void GC_init_inner()
 #   endif
 #   if !defined(THREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) \
        || defined(IRIX_THREADS) || defined(LINUX_THREADS) \
-       || defined(HPUX_THREADS) || defined(QUICK_THREADS)
+       || defined(HPUX_THREADS)
       if (GC_stackbottom == 0) {
          GC_stackbottom = GC_get_stack_base();
       }

diff --git a/boehm-gc/os_dep.c b/boehm-gc/os_dep.c
index 744b1e0..4f697b4 100644 (file)
--- a/boehm-gc/os_dep.c
+++ b/boehm-gc/os_dep.c
@@ -1536,8 +1536,7 @@ void GC_default_push_other_roots()
 
 # if defined(SOLARIS_THREADS) || defined(WIN32_THREADS) \
      || defined(IRIX_THREADS) || defined(LINUX_THREADS) \
-     || defined(IRIX_JDK_THREADS) || defined(HPUX_THREADS) \
-     || defined(QUICK_THREADS)
+     || defined(IRIX_JDK_THREADS) || defined(HPUX_THREADS)
 
 extern void GC_push_all_stacks();
 

diff --git a/boehm-gc/quick_threads.c b/boehm-gc/quick_threads.c
deleted file mode 100644 (file)
index be2e564..0000000
--- a/boehm-gc/quick_threads.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Support code for cooperative coop/quick threads.
- * Copyright (c) 1998, 1999 Cygnus Solutions.
- */
-
-#include "gcconfig.h"
-
-#ifdef QUICK_THREADS
-
-#include "gc_priv.h"
-
-#include "coop.h"
-
-void GC_push_all_stacks (void)
-{
-  coop_t *t;
-  ptr_t lo, hi;
-
-  t = coop_first_thread ();
-
-  if (t == NULL)
-    {
-      /* Threads haven't started, so mark the real stack.  */
-#ifdef STACK_GROWS_DOWN
-      GC_push_all_stack( GC_approx_sp(), GC_stackbottom );
-#else
-      GC_push_all_stack( GC_stackbottom, GC_approx_sp() );
-#endif
-    }
-  else
-    {
-      for ( ; t != NULL; t = coop_next_thread (t))
-       {
-         if (t == coop_global_curr)
-           lo = GC_approx_sp ();
-         else
-           {
-             lo = t->top;
-             /* LO can be NULL when the new thread has not yet been
-                used.  */
-             if (! lo)
-               continue;
-           }
-         hi = t->base;
-
-#ifdef STACK_GROWS_DOWN
-         GC_push_all_stack (lo, hi);
-#else
-         GC_push_all_stack (hi, lo);
-#endif
-       }
-    }
-}
-
-#endif /* QUICK_THREADS */