* Makefile.direct, alloc.c: Resync to upstream 6.3 alpha 1.

From-SVN: r78142

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index ebdb8dd..da5d649 100644 (file)
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-19  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+       * Makefile.direct, alloc.c: Resync to upstream 6.3 alpha 1.
+
 2004-01-20  Andrew Haley  <aph@redhat.com>
 
        * include/private/gcconfig.h (USE_MMAP): Define for all Linux.

diff --git a/boehm-gc/Makefile.direct b/boehm-gc/Makefile.direct
index a884ee5..52b9137 100644 (file)
--- a/boehm-gc/Makefile.direct
+++ b/boehm-gc/Makefile.direct
@@ -10,13 +10,20 @@
 #       c++ interface to gc.a
 # cord/de - builds dumb editor based on cords.
 ABI_FLAG= 
+# ABI_FLAG should be the cc flag that specifies the ABI.  On most
+# platforms this will be the empty string.  Possible values:
+# +DD64 for 64-bit executable on HP/UX.
+# -n32, -n64, -o32 for SGI/MIPS ABIs.
+
+AS_ABI_FLAG=$(ABI_FLAG)
+# ABI flag for assembler.  On HP/UX this is +A64 for 64 bit
+# executables.
+
 CC=cc $(ABI_FLAG)
 CXX=g++ $(ABI_FLAG)
-AS=as $(ABI_FLAG)
+AS=as $(AS_ABI_FLAG)
 #  The above doesn't work with gas, which doesn't run cpp.
 #  Define AS as `gcc -c -x assembler-with-cpp' instead.
-#  Under Irix 6, you will have to specify the ABI (-o32, -n32, or -64)
-#  if you use something other than the default ABI on your machine.
 
 # Redefining srcdir allows object code for the nonPCR version of the collector
 # to be generated in different directories.
@@ -57,7 +64,7 @@ HOSTCFLAGS=$(CFLAGS)
 #   gc.h before performing thr_ or dl* or GC_ operations.)
 #   Must also define -D_REENTRANT.
 # -DGC_SOLARIS_PTHREADS enables support for Solaris pthreads.
-#   Define SOLARIS_THREADS as well.
+#   (Internally this define GC_SOLARIS_THREADS as well.)
 # -DGC_IRIX_THREADS enables support for Irix pthreads.  See README.irix.
 # -DGC_HPUX_THREADS enables support for HP/UX 11 pthreads.
 #   Also requires -D_REENTRANT or -D_POSIX_C_SOURCE=199506L. See README.hp.

diff --git a/boehm-gc/alloc.c b/boehm-gc/alloc.c
index f53061f..d2b874f 100644 (file)
--- a/boehm-gc/alloc.c
+++ b/boehm-gc/alloc.c
@@ -126,7 +126,6 @@ int GC_n_attempts = 0;              /* Number of attempts at finishing      */
     unsigned long time_diff;
     
     if ((count++ & 3) != 0) return(0);
-#ifndef NO_CLOCK
     GET_TIME(current_time);
     time_diff = MS_TIME_DIFF(current_time,GC_start_time);
     if (time_diff >= GC_time_limit) {
@@ -139,7 +138,6 @@ int GC_n_attempts = 0;              /* Number of attempts at finishing      */
 #      endif
        return(1);
     }
-#endif
     return(0);
   }
 #endif /* !SMALL_CONFIG */