-diff -urNb boehm-gc/ChangeLog boehm-gc/ChangeLog
+diff -buNr boehm-gc/ChangeLog boehm-gc/ChangeLog
--- boehm-gc/ChangeLog Tue May 13 17:08:56 2003
-+++ boehm-gc/ChangeLog Tue Jan 21 22:02:28 2003
++++ boehm-gc/ChangeLog Sat Sep 13 01:32:41 2003
@@ -1,69 +1,3 @@
-2003-05-13 Release Manager
-
2002-12-31 Tom Tromey <tromey@redhat.com>
For PR libgcj/8933:
-diff -urNb boehm-gc/Makefile.am boehm-gc/Makefile.am
+diff -buNr boehm-gc/Makefile.am boehm-gc/Makefile.am
--- boehm-gc/Makefile.am Mon Jan 27 17:44:52 2003
-+++ boehm-gc/Makefile.am Mon May 26 13:08:40 2003
++++ boehm-gc/Makefile.am Sat Sep 13 01:32:41 2003
@@ -16,22 +16,38 @@
MULTIDO = true
MULTICLEAN = true
# Work around what appears to be a GNU make bug handling MAKEFLAGS
# values defined in terms of make variables, as is the case for CC and
-diff -urNb boehm-gc/Makefile.am~ boehm-gc/Makefile.am~
+diff -buNr boehm-gc/Makefile.am~ boehm-gc/Makefile.am~
--- boehm-gc/Makefile.am~ Wed Dec 31 16:00:00 1969
-+++ boehm-gc/Makefile.am~ Thu Oct 24 16:42:27 2002
++++ boehm-gc/Makefile.am~ Sat Sep 13 01:32:41 2003
@@ -0,0 +1,159 @@
+## Process this file with automake to produce Makefile.in.
+
+ $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean
+
+MAKEOVERRIDES=
-diff -urNb boehm-gc/Makefile.in boehm-gc/Makefile.in
+diff -buNr boehm-gc/Makefile.in boehm-gc/Makefile.in
--- boehm-gc/Makefile.in Tue May 13 17:18:14 2003
-+++ boehm-gc/Makefile.in Mon May 26 13:08:48 2003
++++ boehm-gc/Makefile.in Sat Sep 13 01:32:41 2003
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -urNb boehm-gc/allchblk.c boehm-gc/allchblk.c
+diff -buNr boehm-gc/allchblk.c boehm-gc/allchblk.c
--- boehm-gc/allchblk.c Mon Apr 8 17:39:15 2002
-+++ boehm-gc/allchblk.c Mon May 26 12:48:52 2003
++++ boehm-gc/allchblk.c Sat Sep 13 01:32:42 2003
@@ -47,12 +47,16 @@
struct hblk * GC_hblkfreelist[N_HBLK_FLS+1] = { 0 };
# endif /* !USE_MUNMAP */
}
/* If the next heap block is obviously better, go on. */
-diff -urNb boehm-gc/alloc.c boehm-gc/alloc.c
+diff -buNr boehm-gc/alloc.c boehm-gc/alloc.c
--- boehm-gc/alloc.c Mon Mar 3 22:38:30 2003
-+++ boehm-gc/alloc.c Mon May 26 12:48:52 2003
++++ boehm-gc/alloc.c Sat Sep 13 01:32:42 2003
@@ -72,6 +72,13 @@
GC_bool GC_need_full_gc = FALSE;
/* Need full GC do to heap growth. */
return(*flh);
}
-diff -urNb boehm-gc/alpha_mach_dep.s boehm-gc/alpha_mach_dep.s
+diff -buNr boehm-gc/alpha_mach_dep.s boehm-gc/alpha_mach_dep.s
--- boehm-gc/alpha_mach_dep.s Fri Aug 17 11:30:45 2001
-+++ boehm-gc/alpha_mach_dep.s Mon May 26 12:48:52 2003
++++ boehm-gc/alpha_mach_dep.s Sat Sep 13 01:32:42 2003
@@ -1,3 +1,4 @@
-+ # $Id: darwin-gc.patch,v 1.1 2003/09/13 04:00:51 megacz Exp $
++ # $Id: darwin-gc.patch,v 1.2 2003/09/13 09:03:17 megacz Exp $
.arch ev6
.text
-diff -urNb boehm-gc/autom4te.cache/output.0 boehm-gc/autom4te.cache/output.0
+diff -buNr boehm-gc/autom4te.cache/output.0 boehm-gc/autom4te.cache/output.0
--- boehm-gc/autom4te.cache/output.0 Wed Dec 31 16:00:00 1969
-+++ boehm-gc/autom4te.cache/output.0 Mon May 26 13:14:22 2003
++++ boehm-gc/autom4te.cache/output.0 Sat Sep 13 01:32:42 2003
@@ -0,0 +1,5049 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNb boehm-gc/autom4te.cache/output.1 boehm-gc/autom4te.cache/output.1
+diff -buNr boehm-gc/autom4te.cache/output.1 boehm-gc/autom4te.cache/output.1
--- boehm-gc/autom4te.cache/output.1 Wed Dec 31 16:00:00 1969
-+++ boehm-gc/autom4te.cache/output.1 Sat May 31 15:09:31 2003
++++ boehm-gc/autom4te.cache/output.1 Sat Sep 13 01:32:42 2003
@@ -0,0 +1,9496 @@
+@%:@! /bin/sh
+@%:@ Guess values for system-dependent variables and create Makefiles.
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
+
-diff -urNb boehm-gc/autom4te.cache/requests boehm-gc/autom4te.cache/requests
+diff -buNr boehm-gc/autom4te.cache/requests boehm-gc/autom4te.cache/requests
--- boehm-gc/autom4te.cache/requests Wed Dec 31 16:00:00 1969
-+++ boehm-gc/autom4te.cache/requests Sat May 31 15:09:32 2003
++++ boehm-gc/autom4te.cache/requests Sat Sep 13 01:32:42 2003
@@ -0,0 +1,198 @@
+# This file was created by autom4te-2.54.
+# It contains the lists of macros which have been traced.
+ ], 'Request' )
+ );
+
-diff -urNb boehm-gc/autom4te.cache/traces.0 boehm-gc/autom4te.cache/traces.0
+diff -buNr boehm-gc/autom4te.cache/traces.0 boehm-gc/autom4te.cache/traces.0
--- boehm-gc/autom4te.cache/traces.0 Wed Dec 31 16:00:00 1969
-+++ boehm-gc/autom4te.cache/traces.0 Mon May 26 13:14:22 2003
++++ boehm-gc/autom4te.cache/traces.0 Sat Sep 13 01:32:42 2003
@@ -0,0 +1,185 @@
+m4trace:configure.in:16: -1- AC_INIT([gcj_mlc.c])
+m4trace:configure.in:16: -1- m4_pattern_forbid([^_?A[CHUM]_])
+m4trace:configure.in:317: -1- AC_CONFIG_FILES([Makefile include/Makefile])
+m4trace:configure.in:317: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.in:317: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNb boehm-gc/autom4te.cache/traces.1 boehm-gc/autom4te.cache/traces.1
+diff -buNr boehm-gc/autom4te.cache/traces.1 boehm-gc/autom4te.cache/traces.1
--- boehm-gc/autom4te.cache/traces.1 Wed Dec 31 16:00:00 1969
-+++ boehm-gc/autom4te.cache/traces.1 Sat May 31 15:09:31 2003
++++ boehm-gc/autom4te.cache/traces.1 Sat Sep 13 01:32:42 2003
@@ -0,0 +1,250 @@
+m4trace:aclocal.m4:166: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.in:16: -1- m4_pattern_forbid([^_?A[CHUM]_])
+m4trace:configure.in:317: -1- AC_CONFIG_FILES([Makefile include/Makefile])
+m4trace:configure.in:317: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.in:317: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-diff -urNb boehm-gc/backgraph.c boehm-gc/backgraph.c
+diff -buNr boehm-gc/backgraph.c boehm-gc/backgraph.c
--- boehm-gc/backgraph.c Wed Jan 30 18:48:45 2002
-+++ boehm-gc/backgraph.c Mon May 26 12:48:52 2003
++++ boehm-gc/backgraph.c Sat Sep 13 01:32:42 2003
@@ -307,6 +307,7 @@
}
while (currentp < (word *)(p + gc_descr)) {
if (current >= (word)GC_least_plausible_heap_addr &&
current <= (word)GC_greatest_plausible_heap_addr) {
ptr_t target = GC_base((GC_PTR)current);
-diff -urNb boehm-gc/configure boehm-gc/configure
+diff -buNr boehm-gc/configure boehm-gc/configure
--- boehm-gc/configure Tue May 13 17:18:14 2003
-+++ boehm-gc/configure Sat May 31 21:21:37 2003
++++ boehm-gc/configure Sat Sep 13 01:32:42 2003
@@ -61,7 +61,6 @@
program_transform_name=s,x,x,
silent=
DEFS="$DEFS"
EOF
-diff -urNb boehm-gc/configure.in boehm-gc/configure.in
+diff -buNr boehm-gc/configure.in boehm-gc/configure.in
--- boehm-gc/configure.in Mon Apr 28 13:55:07 2003
-+++ boehm-gc/configure.in Mon May 26 13:33:22 2003
++++ boehm-gc/configure.in Sat Sep 13 01:32:42 2003
@@ -1,4 +1,4 @@
-# Copyright (c) 1999, 2000, 2001, 2002, 2003 by Red Hat, Inc. All rights reserved.
+# Copyright (c) 1999, 2000, 2001, 2002 by Red Hat, Inc. All rights reserved.
-ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
DEFS="$DEFS"
)
-diff -urNb boehm-gc/configure.in~ boehm-gc/configure.in~
+diff -buNr boehm-gc/configure.in~ boehm-gc/configure.in~
--- boehm-gc/configure.in~ Wed Dec 31 16:00:00 1969
-+++ boehm-gc/configure.in~ Mon May 26 13:33:22 2003
++++ boehm-gc/configure.in~ Sat Sep 13 01:32:42 2003
@@ -0,0 +1,317 @@
+# Copyright (c) 1999, 2000, 2001, 2002 by Red Hat, Inc. All rights reserved.
+#
+CC="${CC}"
+DEFS="$DEFS"
+)
-diff -urNb boehm-gc/darwin_stop_world.c boehm-gc/darwin_stop_world.c
+diff -buNr boehm-gc/darwin_stop_world.c boehm-gc/darwin_stop_world.c
--- boehm-gc/darwin_stop_world.c Wed Dec 31 16:00:00 1969
-+++ boehm-gc/darwin_stop_world.c Sun Jun 1 14:17:58 2003
++++ boehm-gc/darwin_stop_world.c Sat Sep 13 01:32:42 2003
@@ -0,0 +1,200 @@
+#include "private/pthread_support.h"
+
+}
+
+#endif
-diff -urNb boehm-gc/dbg_mlc.c boehm-gc/dbg_mlc.c
+diff -buNr boehm-gc/dbg_mlc.c boehm-gc/dbg_mlc.c
--- boehm-gc/dbg_mlc.c Tue Feb 12 21:38:39 2002
-+++ boehm-gc/dbg_mlc.c Mon May 26 12:48:52 2003
++++ boehm-gc/dbg_mlc.c Sat Sep 13 01:32:42 2003
@@ -60,7 +60,7 @@
# include <stdlib.h>
obj);
}
if (0 == fn) {
-diff -urNb boehm-gc/dyn_load.c boehm-gc/dyn_load.c
+diff -buNr boehm-gc/dyn_load.c boehm-gc/dyn_load.c
--- boehm-gc/dyn_load.c Mon Mar 3 22:38:30 2003
-+++ boehm-gc/dyn_load.c Thu Sep 11 21:57:10 2003
++++ boehm-gc/dyn_load.c Sat Sep 13 02:01:31 2003
@@ -55,9 +55,10 @@
!defined(MSWIN32) && !defined(MSWINCE) && \
!(defined(ALPHA) && defined(OSF1)) && \
#else /* !DYNAMIC_LOADING */
-diff -urNb boehm-gc/finalize.c boehm-gc/finalize.c
+diff -buNr boehm-gc/dyn_load.c.rej boehm-gc/dyn_load.c.rej
+--- boehm-gc/dyn_load.c.rej Wed Dec 31 16:00:00 1969
++++ boehm-gc/dyn_load.c.rej Sat Sep 13 01:46:24 2003
+@@ -0,0 +1,50 @@
++***************
++*** 284,290 ****
++ /* Defined in os_dep.c. */
++
++ char *GC_parse_map_entry(char *buf_ptr, word *start, word *end,
++- char *prot_buf, unsigned int *maj_dev);
++ word GC_apply_to_maps(word (*fn)(char *));
++ /* From os_dep.c */
++
++--- 284,290 ----
++ /* Defined in os_dep.c. */
++
++ char *GC_parse_map_entry(char *buf_ptr, word *start, word *end,
+++ char *prot_buf, unsigned int *maj_dev);
++ word GC_apply_to_maps(word (*fn)(char *));
++ /* From os_dep.c */
++
++***************
++*** 335,341 ****
++ if (start >= least_ha && end <= greatest_ha) continue;
++ GC_add_roots_inner((char *)start, (char *)end, TRUE);
++ }
++- }
++ return 1;
++ }
++
++--- 335,341 ----
++ if (start >= least_ha && end <= greatest_ha) continue;
++ GC_add_roots_inner((char *)start, (char *)end, TRUE);
++ }
+++ }
++ return 1;
++ }
++
++***************
++*** 971,976 ****
++
++ #ifdef DARWIN
++
++ #include <mach-o/dyld.h>
++ #include <mach-o/getsect.h>
++
++--- 971,977 ----
++
++ #ifdef DARWIN
++
+++ #define __private_extern__
++ #include <mach-o/dyld.h>
++ #include <mach-o/getsect.h>
++
+diff -buNr boehm-gc/finalize.c boehm-gc/finalize.c
--- boehm-gc/finalize.c Mon Feb 11 20:37:53 2002
-+++ boehm-gc/finalize.c Mon May 26 12:48:52 2003
++++ boehm-gc/finalize.c Sat Sep 13 01:32:42 2003
@@ -207,7 +207,8 @@
UNLOCK();
ENABLE_SIGNALS();
+}
+
+#endif /* NO_DEBUGGING */
-diff -urNb boehm-gc/gc_dlopen.c boehm-gc/gc_dlopen.c
+diff -buNr boehm-gc/gc_dlopen.c boehm-gc/gc_dlopen.c
--- boehm-gc/gc_dlopen.c Tue Oct 16 02:01:35 2001
-+++ boehm-gc/gc_dlopen.c Mon May 26 12:48:52 2003
++++ boehm-gc/gc_dlopen.c Sat Sep 13 01:32:42 2003
@@ -19,12 +19,14 @@
/*
* This used to be in dyn_load.c. It was extracted into a separate file
# endif
return(result);
}
-diff -urNb boehm-gc/gcj_mlc.c boehm-gc/gcj_mlc.c
+diff -buNr boehm-gc/gcj_mlc.c boehm-gc/gcj_mlc.c
--- boehm-gc/gcj_mlc.c Mon Feb 11 20:37:53 2002
-+++ boehm-gc/gcj_mlc.c Mon May 26 12:48:52 2003
++++ boehm-gc/gcj_mlc.c Sat Sep 13 01:32:42 2003
@@ -157,6 +157,7 @@
GC_words_allocd += lw;
}
UNLOCK();
} else {
LOCK();
-diff -urNb boehm-gc/if_mach.c boehm-gc/if_mach.c
+diff -buNr boehm-gc/if_mach.c boehm-gc/if_mach.c
--- boehm-gc/if_mach.c Fri Aug 17 11:30:45 2001
-+++ boehm-gc/if_mach.c Mon May 26 12:48:52 2003
++++ boehm-gc/if_mach.c Sat Sep 13 01:32:42 2003
@@ -14,7 +14,7 @@
if (strcmp(MACH_TYPE, argv[1]) != 0) return(0);
if (strcmp(OS_TYPE, "") != 0 && strcmp(argv[2], "") != 0
fflush(stdout);
execvp(argv[3], argv+3);
perror("Couldn't execute");
-diff -urNb boehm-gc/include/Makefile.in boehm-gc/include/Makefile.in
+diff -buNr boehm-gc/include/Makefile.in boehm-gc/include/Makefile.in
--- boehm-gc/include/Makefile.in Tue Dec 31 09:52:45 2002
-+++ boehm-gc/include/Makefile.in Mon May 26 13:08:48 2003
++++ boehm-gc/include/Makefile.in Sat Sep 13 01:32:42 2003
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urNb boehm-gc/include/gc.h boehm-gc/include/gc.h
+diff -buNr boehm-gc/include/gc.h boehm-gc/include/gc.h
--- boehm-gc/include/gc.h Mon Feb 11 20:37:56 2002
-+++ boehm-gc/include/gc.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/gc.h Sat Sep 13 01:32:42 2003
@@ -30,91 +30,7 @@
# define _GC_H
# endif
#endif
-diff -urNb boehm-gc/include/gc_allocator.h boehm-gc/include/gc_allocator.h
+diff -buNr boehm-gc/include/gc_allocator.h boehm-gc/include/gc_allocator.h
--- boehm-gc/include/gc_allocator.h Wed Dec 31 16:00:00 1969
-+++ boehm-gc/include/gc_allocator.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/gc_allocator.h Sat Sep 13 01:32:42 2003
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 1996-1997
+ return false;
+}
+
-diff -urNb boehm-gc/include/gc_config_macros.h boehm-gc/include/gc_config_macros.h
+diff -buNr boehm-gc/include/gc_config_macros.h boehm-gc/include/gc_config_macros.h
--- boehm-gc/include/gc_config_macros.h Wed Dec 31 16:00:00 1969
-+++ boehm-gc/include/gc_config_macros.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/gc_config_macros.h Sat Sep 13 01:32:42 2003
@@ -0,0 +1,142 @@
+/*
+ * This should never be included directly. It is included only from gc.h.
+#define GC_API extern
+#endif
+
-diff -urNb boehm-gc/include/gc_cpp.h boehm-gc/include/gc_cpp.h
+diff -buNr boehm-gc/include/gc_cpp.h boehm-gc/include/gc_cpp.h
--- boehm-gc/include/gc_cpp.h Fri Aug 17 18:04:43 2001
-+++ boehm-gc/include/gc_cpp.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/gc_cpp.h Sat Sep 13 01:32:42 2003
@@ -134,7 +134,9 @@
#include "gc.h"
inline void gc_cleanup::cleanup( void* obj, void* displ ) {
((gc_cleanup*) ((char*) obj + (ptrdiff_t) displ))->~gc_cleanup();}
-diff -urNb boehm-gc/include/gc_local_alloc.h boehm-gc/include/gc_local_alloc.h
+diff -buNr boehm-gc/include/gc_local_alloc.h boehm-gc/include/gc_local_alloc.h
--- boehm-gc/include/gc_local_alloc.h Fri Aug 17 11:30:50 2001
-+++ boehm-gc/include/gc_local_alloc.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/gc_local_alloc.h Sat Sep 13 01:32:42 2003
@@ -33,6 +33,9 @@
* -DTHREAD_LOCAL_ALLOC, which is currently supported only on Linux.
*
*/
#ifndef GC_LOCAL_ALLOC_H
-diff -urNb boehm-gc/include/gc_mark.h boehm-gc/include/gc_mark.h
+diff -buNr boehm-gc/include/gc_mark.h boehm-gc/include/gc_mark.h
--- boehm-gc/include/gc_mark.h Fri Aug 17 11:30:50 2001
-+++ boehm-gc/include/gc_mark.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/gc_mark.h Sat Sep 13 01:32:42 2003
@@ -129,7 +129,9 @@
/* be reserved for exceptional cases. That will ensure that */
/* performance of this call is not extremely performance critical. */
struct GC_ms_entry *GC_mark_and_push
GC_PROTO((GC_PTR obj,
struct GC_ms_entry * mark_stack_ptr,
-diff -urNb boehm-gc/include/gc_pthread_redirects.h boehm-gc/include/gc_pthread_redirects.h
+diff -buNr boehm-gc/include/gc_pthread_redirects.h boehm-gc/include/gc_pthread_redirects.h
--- boehm-gc/include/gc_pthread_redirects.h Tue Oct 16 21:55:28 2001
-+++ boehm-gc/include/gc_pthread_redirects.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/gc_pthread_redirects.h Sat Sep 13 01:32:42 2003
@@ -52,15 +52,21 @@
int GC_pthread_create(pthread_t *new_thread,
const pthread_attr_t *attr,
#endif /* GC_xxxxx_THREADS */
-diff -urNb boehm-gc/include/gc_typed.h boehm-gc/include/gc_typed.h
+diff -buNr boehm-gc/include/gc_typed.h boehm-gc/include/gc_typed.h
--- boehm-gc/include/gc_typed.h Fri Aug 17 11:30:50 2001
-+++ boehm-gc/include/gc_typed.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/gc_typed.h Sat Sep 13 01:32:42 2003
@@ -29,14 +29,21 @@
# include "gc.h"
# endif
#endif /* _GC_TYPED_H */
-diff -urNb boehm-gc/include/new_gc_alloc.h boehm-gc/include/new_gc_alloc.h
+diff -buNr boehm-gc/include/new_gc_alloc.h boehm-gc/include/new_gc_alloc.h
--- boehm-gc/include/new_gc_alloc.h Tue Oct 16 02:01:38 2001
-+++ boehm-gc/include/new_gc_alloc.h Mon May 26 13:28:19 2003
++++ boehm-gc/include/new_gc_alloc.h Sat Sep 13 01:32:42 2003
@@ -64,6 +64,14 @@
#endif
#endif
#define GC_ALLOC_H
-diff -urNb boehm-gc/include/private/darwin_semaphore.h boehm-gc/include/private/darwin_semaphore.h
+diff -buNr boehm-gc/include/private/darwin_semaphore.h boehm-gc/include/private/darwin_semaphore.h
--- boehm-gc/include/private/darwin_semaphore.h Wed Dec 31 16:00:00 1969
-+++ boehm-gc/include/private/darwin_semaphore.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/darwin_semaphore.h Sat Sep 13 01:32:42 2003
@@ -0,0 +1,68 @@
+#ifndef GC_DARWIN_SEMAPHORE_H
+#define GC_DARWIN_SEMAPHORE_H
+}
+
+#endif
-diff -urNb boehm-gc/include/private/darwin_stop_world.h boehm-gc/include/private/darwin_stop_world.h
+diff -buNr boehm-gc/include/private/darwin_stop_world.h boehm-gc/include/private/darwin_stop_world.h
--- boehm-gc/include/private/darwin_stop_world.h Wed Dec 31 16:00:00 1969
-+++ boehm-gc/include/private/darwin_stop_world.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/darwin_stop_world.h Sat Sep 13 01:32:42 2003
@@ -0,0 +1,15 @@
+#ifndef GC_DARWIN_STOP_WORLD_H
+#define GC_DARWIN_STOP_WORLD_H
+};
+
+#endif
-diff -urNb boehm-gc/include/private/dbg_mlc.h boehm-gc/include/private/dbg_mlc.h
+diff -buNr boehm-gc/include/private/dbg_mlc.h boehm-gc/include/private/dbg_mlc.h
--- boehm-gc/include/private/dbg_mlc.h Mon Feb 11 20:37:57 2002
-+++ boehm-gc/include/private/dbg_mlc.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/dbg_mlc.h Sat Sep 13 01:32:42 2003
@@ -115,16 +115,24 @@
#ifdef SHORT_DBG_HDRS
#ifdef SAVE_CALL_CHAIN
# define ADD_CALL_CHAIN(base, ra) GC_save_callers(((oh *)(base)) -> oh_ci)
# define PRINT_CALL_CHAIN(base) GC_print_callers(((oh *)(base)) -> oh_ci)
-diff -urNb boehm-gc/include/private/gc_hdrs.h boehm-gc/include/private/gc_hdrs.h
+diff -buNr boehm-gc/include/private/gc_hdrs.h boehm-gc/include/private/gc_hdrs.h
--- boehm-gc/include/private/gc_hdrs.h Fri Aug 17 18:04:43 2001
-+++ boehm-gc/include/private/gc_hdrs.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/gc_hdrs.h Sat Sep 13 01:32:42 2003
@@ -70,7 +70,7 @@
#define ADVANCE(p, hhdr, source) \
{ \
hhdr = new_hdr; \
}
-diff -urNb boehm-gc/include/private/gc_locks.h boehm-gc/include/private/gc_locks.h
+diff -buNr boehm-gc/include/private/gc_locks.h boehm-gc/include/private/gc_locks.h
--- boehm-gc/include/private/gc_locks.h Fri Sep 27 13:40:06 2002
-+++ boehm-gc/include/private/gc_locks.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/gc_locks.h Sat Sep 13 01:32:42 2003
@@ -145,23 +145,24 @@
# if defined(POWERPC)
inline static int GC_test_and_set(volatile unsigned int *addr) {
# endif
# ifndef SET_LOCK_HOLDER
# define SET_LOCK_HOLDER()
-diff -urNb boehm-gc/include/private/gc_pmark.h boehm-gc/include/private/gc_pmark.h
+diff -buNr boehm-gc/include/private/gc_pmark.h boehm-gc/include/private/gc_pmark.h
--- boehm-gc/include/private/gc_pmark.h Mon Feb 11 20:37:57 2002
-+++ boehm-gc/include/private/gc_pmark.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/gc_pmark.h Sat Sep 13 01:32:42 2003
@@ -137,7 +137,7 @@
#ifdef __STDC__
# ifdef PRINT_BLACK_LIST
if ((ptr_t)(p) >= (ptr_t)GC_least_plausible_heap_addr \
&& (ptr_t)(p) < (ptr_t)GC_greatest_plausible_heap_addr) { \
GC_mark_stack_top = GC_mark_and_push( \
-diff -urNb boehm-gc/include/private/gc_priv.h boehm-gc/include/private/gc_priv.h
+diff -buNr boehm-gc/include/private/gc_priv.h boehm-gc/include/private/gc_priv.h
--- boehm-gc/include/private/gc_priv.h Tue Mar 4 09:56:49 2003
-+++ boehm-gc/include/private/gc_priv.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/gc_priv.h Sat Sep 13 01:32:42 2003
@@ -30,6 +30,12 @@
# define BSD_TIME
#endif
# if defined(SPARC) && !defined(SIGPWR)
/* SPARC/Linux doesn't properly define SIGPWR in <signal.h>.
* It is aliased to SIGLOST in asm/signal.h, though. */
-diff -urNb boehm-gc/include/private/gcconfig.h boehm-gc/include/private/gcconfig.h
+diff -buNr boehm-gc/include/private/gcconfig.h boehm-gc/include/private/gcconfig.h
--- boehm-gc/include/private/gcconfig.h Wed Apr 9 17:08:01 2003
-+++ boehm-gc/include/private/gcconfig.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/gcconfig.h Sat Sep 13 01:32:42 2003
@@ -14,10 +14,24 @@
* modified is included with the above copyright notice.
*/
+#endif /* GC_PRIVATE_H */
# endif /* GCCONFIG_H */
-diff -urNb boehm-gc/include/private/pthread_stop_world.h boehm-gc/include/private/pthread_stop_world.h
+diff -buNr boehm-gc/include/private/pthread_stop_world.h boehm-gc/include/private/pthread_stop_world.h
--- boehm-gc/include/private/pthread_stop_world.h Wed Dec 31 16:00:00 1969
-+++ boehm-gc/include/private/pthread_stop_world.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/pthread_stop_world.h Sat Sep 13 01:32:42 2003
@@ -0,0 +1,12 @@
+#ifndef GC_PTHREAD_STOP_WORLD_H
+#define GC_PTHREAD_STOP_WORLD_H
+};
+
+#endif
-diff -urNb boehm-gc/include/private/pthread_support.h boehm-gc/include/private/pthread_support.h
+diff -buNr boehm-gc/include/private/pthread_support.h boehm-gc/include/private/pthread_support.h
--- boehm-gc/include/private/pthread_support.h Wed Dec 31 16:00:00 1969
-+++ boehm-gc/include/private/pthread_support.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/pthread_support.h Sat Sep 13 01:32:42 2003
@@ -0,0 +1,97 @@
+#ifndef GC_PTHREAD_SUPPORT_H
+#define GC_PTHREAD_SUPPORT_H
+
+#endif /* GC_PTHREADS && !GC_SOLARIS_THREADS.... etc */
+#endif /* GC_PTHREAD_SUPPORT_H */
-diff -urNb boehm-gc/include/private/solaris_threads.h boehm-gc/include/private/solaris_threads.h
+diff -buNr boehm-gc/include/private/solaris_threads.h boehm-gc/include/private/solaris_threads.h
--- boehm-gc/include/private/solaris_threads.h Tue Oct 23 16:21:39 2001
-+++ boehm-gc/include/private/solaris_threads.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/solaris_threads.h Sat Sep 13 01:32:42 2003
@@ -16,7 +16,8 @@
# define DETACHED 2 /* Thread is intended to be detached. */
# define CLIENT_OWNS_STACK 4
ptr_t stack;
size_t stack_size;
cond_t join_cv;
-diff -urNb boehm-gc/include/private/specific.h boehm-gc/include/private/specific.h
+diff -buNr boehm-gc/include/private/specific.h boehm-gc/include/private/specific.h
--- boehm-gc/include/private/specific.h Fri Mar 29 14:52:13 2002
-+++ boehm-gc/include/private/specific.h Mon May 26 13:28:24 2003
++++ boehm-gc/include/private/specific.h Sat Sep 13 01:32:42 2003
@@ -85,7 +85,7 @@
unsigned hash_val = CACHE_HASH(qtid);
tse * volatile * entry_ptr = key -> cache + hash_val;
GC_ASSERT(entry -> thread == pthread_self());
return entry -> value;
}
-diff -urNb boehm-gc/irix_threads.c boehm-gc/irix_threads.c
+diff -buNr boehm-gc/irix_threads.c boehm-gc/irix_threads.c
--- boehm-gc/irix_threads.c Sun May 19 10:36:14 2002
-+++ boehm-gc/irix_threads.c Mon May 26 12:48:52 2003
++++ boehm-gc/irix_threads.c Sat Sep 13 01:32:42 2003
@@ -41,6 +41,10 @@
#undef pthread_join
#undef pthread_detach
void GC_thr_init();
#if 0
-diff -urNb boehm-gc/mach_dep.c boehm-gc/mach_dep.c
+diff -buNr boehm-gc/mach_dep.c boehm-gc/mach_dep.c
--- boehm-gc/mach_dep.c Thu Jul 18 13:06:00 2002
-+++ boehm-gc/mach_dep.c Mon May 26 12:48:52 2003
++++ boehm-gc/mach_dep.c Sat Sep 13 01:32:42 2003
@@ -74,7 +74,7 @@
/* on your architecture. Run the test_setjmp program to see whether */
/* there is any chance it will work. */
#if defined(USE_GENERIC_PUSH_REGS)
void GC_generic_push_regs(cold_gc_frame)
-diff -urNb boehm-gc/malloc.c boehm-gc/malloc.c
+diff -buNr boehm-gc/malloc.c boehm-gc/malloc.c
--- boehm-gc/malloc.c Mon Feb 11 20:37:53 2002
-+++ boehm-gc/malloc.c Mon May 26 12:48:52 2003
++++ boehm-gc/malloc.c Sat Sep 13 01:32:42 2003
@@ -182,6 +182,7 @@
ptr_t result;
DCL_LOCK_STATE;
# endif
}
# endif /* REDIRECT_MALLOC */
-diff -urNb boehm-gc/mallocx.c boehm-gc/mallocx.c
+diff -buNr boehm-gc/mallocx.c boehm-gc/mallocx.c
--- boehm-gc/mallocx.c Fri Aug 17 18:04:43 2001
-+++ boehm-gc/mallocx.c Mon May 26 12:48:52 2003
++++ boehm-gc/mallocx.c Sat Sep 13 01:32:42 2003
@@ -142,7 +142,11 @@
}
}
# ifdef ATOMIC_UNCOLLECTABLE
/* Allocate lb bytes of pointerfree, untraced, uncollectable data */
-diff -urNb boehm-gc/mark.c boehm-gc/mark.c
+diff -buNr boehm-gc/mark.c boehm-gc/mark.c
--- boehm-gc/mark.c Fri Mar 29 14:52:12 2002
-+++ boehm-gc/mark.c Mon May 26 12:48:52 2003
++++ boehm-gc/mark.c Sat Sep 13 01:32:42 2003
@@ -19,6 +19,10 @@
# include <stdio.h>
# include "private/gc_pmark.h"
GC_push_all(bottom, top);
} else {
GC_push_all_eager(bottom, top);
-diff -urNb boehm-gc/mark_rts.c boehm-gc/mark_rts.c
+diff -buNr boehm-gc/mark_rts.c boehm-gc/mark_rts.c
--- boehm-gc/mark_rts.c Mon Mar 3 22:38:29 2003
-+++ boehm-gc/mark_rts.c Mon May 26 12:48:52 2003
++++ boehm-gc/mark_rts.c Sat Sep 13 01:32:42 2003
@@ -275,33 +275,72 @@
}
# endif
/*
-diff -urNb boehm-gc/misc.c boehm-gc/misc.c
+diff -buNr boehm-gc/misc.c boehm-gc/misc.c
--- boehm-gc/misc.c Mon Mar 3 22:38:30 2003
-+++ boehm-gc/misc.c Mon May 26 12:48:52 2003
++++ boehm-gc/misc.c Sat Sep 13 01:32:42 2003
@@ -46,8 +46,10 @@
# ifdef GC_SOLARIS_THREADS
mutex_t GC_allocate_ml; /* Implicitly initialized. */
}
#endif /* NO_DEBUGGING */
-diff -urNb boehm-gc/os_dep.c boehm-gc/os_dep.c
+diff -buNr boehm-gc/os_dep.c boehm-gc/os_dep.c
--- boehm-gc/os_dep.c Fri Jul 19 01:54:43 2002
-+++ boehm-gc/os_dep.c Sat May 31 14:46:38 2003
++++ boehm-gc/os_dep.c Sat Sep 13 01:32:42 2003
@@ -80,12 +80,15 @@
# define NEED_FIND_LIMIT
# endif
GC_err_printf0("---------- End address map ----------\n");
}
-diff -urNb boehm-gc/powerpc_darwin_mach_dep.s boehm-gc/powerpc_darwin_mach_dep.s
+diff -buNr boehm-gc/powerpc_darwin_mach_dep.s boehm-gc/powerpc_darwin_mach_dep.s
--- boehm-gc/powerpc_darwin_mach_dep.s Wed Dec 31 16:00:00 1969
-+++ boehm-gc/powerpc_darwin_mach_dep.s Mon May 26 12:48:52 2003
++++ boehm-gc/powerpc_darwin_mach_dep.s Sat Sep 13 01:32:42 2003
@@ -0,0 +1,84 @@
+
+; GC_push_regs function. Under some optimization levels GCC will clobber
+L_GC_push_one$lazy_ptr:
+ .indirect_symbol _GC_push_one
+ .long dyld_stub_binding_helper
-diff -urNb boehm-gc/pthread_stop_world.c boehm-gc/pthread_stop_world.c
+diff -buNr boehm-gc/pthread_stop_world.c boehm-gc/pthread_stop_world.c
--- boehm-gc/pthread_stop_world.c Wed Dec 31 16:00:00 1969
-+++ boehm-gc/pthread_stop_world.c Mon May 26 12:48:52 2003
++++ boehm-gc/pthread_stop_world.c Sat Sep 13 01:32:42 2003
@@ -0,0 +1,445 @@
+#include "private/pthread_support.h"
+
+}
+
+#endif
-diff -urNb boehm-gc/pthread_support.c boehm-gc/pthread_support.c
+diff -buNr boehm-gc/pthread_support.c boehm-gc/pthread_support.c
--- boehm-gc/pthread_support.c Wed Dec 31 16:00:00 1969
-+++ boehm-gc/pthread_support.c Mon May 26 12:48:52 2003
++++ boehm-gc/pthread_support.c Sat Sep 13 01:32:42 2003
@@ -0,0 +1,1568 @@
+/*
+ * Copyright (c) 1994 by Xerox Corporation. All rights reserved.
+
+# endif /* GC_LINUX_THREADS and friends */
+
-diff -urNb boehm-gc/ptr_chck.c boehm-gc/ptr_chck.c
+diff -buNr boehm-gc/ptr_chck.c boehm-gc/ptr_chck.c
--- boehm-gc/ptr_chck.c Fri Aug 17 11:30:46 2001
-+++ boehm-gc/ptr_chck.c Mon May 26 12:48:52 2003
++++ boehm-gc/ptr_chck.c Sat Sep 13 01:32:42 2003
@@ -79,7 +79,7 @@
return(p);
}
goto fail;
}
return(p);
-diff -urNb boehm-gc/reclaim.c boehm-gc/reclaim.c
+diff -buNr boehm-gc/reclaim.c boehm-gc/reclaim.c
--- boehm-gc/reclaim.c Fri Mar 29 14:52:12 2002
-+++ boehm-gc/reclaim.c Mon May 26 12:48:52 2003
++++ boehm-gc/reclaim.c Sat Sep 13 01:32:42 2003
@@ -27,10 +27,43 @@
/* nonzero. */
#endif /* PARALLEL_MARK */
*/
void GC_clear_fl_links(flp)
ptr_t *flp;
-diff -urNb boehm-gc/solaris_pthreads.c boehm-gc/solaris_pthreads.c
+diff -buNr boehm-gc/solaris_pthreads.c boehm-gc/solaris_pthreads.c
--- boehm-gc/solaris_pthreads.c Mon Feb 11 20:37:53 2002
-+++ boehm-gc/solaris_pthreads.c Mon May 26 12:48:52 2003
++++ boehm-gc/solaris_pthreads.c Sat Sep 13 01:32:42 2003
@@ -13,9 +13,8 @@
/*
* Support code for Solaris threads. Provides functionality we wish Sun
# if defined(GC_SOLARIS_PTHREADS)
# include "private/gc_priv.h"
-diff -urNb boehm-gc/solaris_threads.c boehm-gc/solaris_threads.c
+diff -buNr boehm-gc/solaris_threads.c boehm-gc/solaris_threads.c
--- boehm-gc/solaris_threads.c Mon Feb 11 20:37:53 2002
-+++ boehm-gc/solaris_threads.c Mon May 26 12:48:52 2003
++++ boehm-gc/solaris_threads.c Sat Sep 13 01:32:42 2003
@@ -37,6 +37,10 @@
# include <unistd.h>
# include <errno.h>
result = thr_create(stack, stack_size, start_routine,
arg, flags & ~THR_DETACHED, &my_new_thread);
if (result == 0) {
-diff -urNb boehm-gc/threadlibs.c boehm-gc/threadlibs.c
+diff -buNr boehm-gc/threadlibs.c boehm-gc/threadlibs.c
--- boehm-gc/threadlibs.c Mon Feb 11 20:37:53 2002
-+++ boehm-gc/threadlibs.c Mon May 26 12:48:52 2003
++++ boehm-gc/threadlibs.c Sat Sep 13 01:32:42 2003
@@ -4,13 +4,14 @@
int main()
{
# endif
return 0;
}
-diff -urNb boehm-gc/typd_mlc.c boehm-gc/typd_mlc.c
+diff -buNr boehm-gc/typd_mlc.c boehm-gc/typd_mlc.c
--- boehm-gc/typd_mlc.c Fri Aug 17 11:30:46 2001
-+++ boehm-gc/typd_mlc.c Mon May 26 12:48:52 2003
++++ boehm-gc/typd_mlc.c Sat Sep 13 01:32:42 2003
@@ -437,6 +437,7 @@
for (; bm != 0; bm >>= 1, current_p++) {
if (bm & 1) {
# ifdef MERGE_SIZES
lw = GC_size_map[lb]; /* May have been uninitialized. */
# endif
-diff -urNb boehm-gc/version.h boehm-gc/version.h
+diff -buNr boehm-gc/version.h boehm-gc/version.h
--- boehm-gc/version.h Mon Feb 11 20:37:53 2002
-+++ boehm-gc/version.h Mon May 26 12:48:52 2003
++++ boehm-gc/version.h Sat Sep 13 01:32:42 2003
@@ -1,8 +1,25 @@
-#define GC_VERSION_MAJOR 6
-#define GC_VERSION_MINOR 1
#ifndef GC_NO_VERSION_VAR
-diff -urNb boehm-gc/win32_threads.c boehm-gc/win32_threads.c
+diff -buNr boehm-gc/win32_threads.c boehm-gc/win32_threads.c
--- boehm-gc/win32_threads.c Mon Apr 28 13:55:07 2003
-+++ boehm-gc/win32_threads.c Mon May 26 12:48:52 2003
++++ boehm-gc/win32_threads.c Sat Sep 13 01:32:42 2003
@@ -2,12 +2,26 @@
#include "private/gc_priv.h"
# endif /* !MSWINCE */
---- boehm-gc/dyn_load.c Thu Sep 11 21:57:10 2003
-+++ boehm-gc/dyn_load.c Thu Sep 11 22:27:30 2003
-@@ -284,7 +284,7 @@
- /* Defined in os_dep.c. */
-
- char *GC_parse_map_entry(char *buf_ptr, word *start, word *end,
-- char *prot_buf, unsigned int *maj_dev);
-+ char *prot_buf, unsigned int *maj_dev);
- word GC_apply_to_maps(word (*fn)(char *));
- /* From os_dep.c */
-
-@@ -335,7 +335,7 @@
- if (start >= least_ha && end <= greatest_ha) continue;
- GC_add_roots_inner((char *)start, (char *)end, TRUE);
- }
-- }
-+ }
- return 1;
- }
-
-@@ -971,6 +971,7 @@
-
- #ifdef DARWIN
-
-+#define __private_extern__
- #include <mach-o/dyld.h>
- #include <mach-o/getsect.h>
-