[m-rev.] diff: back out updates due to import of boehm_gc.

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 0.1
Branches: main

boehm_gc/Makefile.dj:
boehm_gc/ptr_chck.c:
boehm_gc/include/Makefile.am:
boehm_gc/include/Makefile.in:
boehm_gc/include/gc_config_macros.h:
    Back out updates due to import of gc_6_3alpha2.

Index: boehm_gc/Makefile.dj
===================================================================
RCS file: /home/staff/zs/imp/mercury/boehm_gc/Makefile.dj,v
retrieving revision 1.1.1.7
diff -u -r1.1.1.7 Makefile.dj
--- boehm_gc/Makefile.dj	27 Oct 2003 20:32:13 -0000	1.1.1.7
+++ boehm_gc/Makefile.dj	27 Oct 2003 20:35:51 -0000
@@ -177,7 +177,7 @@
     include/private/solaris_threads.h include/gc_backptr.h \
     hpux_test_and_clear.s include/gc_gcj.h \
     include/gc_local_alloc.h include/private/dbg_mlc.h \
-    include/private/specific.h powerpc_darwin_mach_dep.s \
+    include/private/specific.h powerpc_macosx_mach_dep.s \
     include/leak_detector.h $(CORD_SRCS)
 
 OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
@@ -285,13 +285,13 @@
 	ln liblinuxgc.so libgc.so
 
 mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/mips_sgi_mach_dep.S $(srcdir)/mips_ultrix_mach_dep.s \
-            $(srcdir)/rs6000_mach_dep.s $(srcdir)/powerpc_darwin_mach_dep.s $(UTILS)
+            $(srcdir)/rs6000_mach_dep.s $(srcdir)/powerpc_macosx_mach_dep.s $(UTILS)
 	rm -f mach_dep.o
 	./if_mach MIPS IRIX5 $(AS) -o mach_dep.o $(srcdir)/mips_sgi_mach_dep.S
 	./if_mach MIPS RISCOS $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
 	./if_mach MIPS ULTRIX $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
 	./if_mach RS6000 "" $(AS) -o mach_dep.o $(srcdir)/rs6000_mach_dep.s
-	./if_mach POWERPC MACOSX $(AS) -o mach_dep.o $(srcdir)/powerpc_darwin_mach_dep.s
+	./if_mach POWERPC MACOSX $(AS) -o mach_dep.o $(srcdir)/powerpc_macosx_mach_dep.s
 	./if_mach ALPHA "" $(AS) -o mach_dep.o $(srcdir)/alpha_mach_dep.S
 	./if_mach SPARC SUNOS5 $(AS) -o mach_dep.o $(srcdir)/sparc_mach_dep.S
 	./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
Index: boehm_gc/ptr_chck.c
===================================================================
RCS file: /home/staff/zs/imp/mercury/boehm_gc/ptr_chck.c,v
retrieving revision 1.1.1.7
diff -u -r1.1.1.7 ptr_chck.c
--- boehm_gc/ptr_chck.c	27 Oct 2003 20:32:06 -0000	1.1.1.7
+++ boehm_gc/ptr_chck.c	27 Oct 2003 20:37:20 -0000
@@ -79,7 +79,7 @@
 	return(p);
     }
     sz = WORDS_TO_BYTES(hhdr -> hb_sz);
-    if (sz > MAXOBJBYTES) {
+    if (sz > WORDS_TO_BYTES(MAXOBJSZ)) {
       base = (ptr_t)HBLKPTR(p);
       limit = base + sz;
       if ((ptr_t)p >= limit) {
@@ -165,7 +165,7 @@
     pdispl = HBLKDISPL(p);
     map_entry = MAP_ENTRY((hhdr -> hb_map), pdispl);
     if (map_entry == OBJ_INVALID
-    	|| sz > MAXOBJBYTES && (ptr_t)p >= (ptr_t)h + sz) {
+    	|| sz > MAXOBJSZ && (ptr_t)p >= (ptr_t)h + sz) {
     	goto fail;
     }
     return(p);
Index: boehm_gc/include/Makefile.am
===================================================================
RCS file: /home/staff/zs/imp/mercury/boehm_gc/include/Makefile.am,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile.am
--- boehm_gc/include/Makefile.am	27 Oct 2003 20:32:14 -0000	1.1.1.2
+++ boehm_gc/include/Makefile.am	27 Oct 2003 20:38:42 -0000
@@ -30,6 +30,4 @@
     private/gc_pmark.h private/gc_locks.h \
     private/solaris_threads.h private/dbg_mlc.h \
     private/specific.h private/cord_pos.h \
-    private/pthread_support.h private/pthread_stop_world.h \
-    private/darwin_semaphore.h private/darwin_stop_world.h \
     cord.h ec.h javaxfc.h 
Index: boehm_gc/include/Makefile.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/boehm_gc/include/Makefile.in,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile.in
--- boehm_gc/include/Makefile.in	27 Oct 2003 20:32:14 -0000	1.1.1.2
+++ boehm_gc/include/Makefile.in	27 Oct 2003 20:38:42 -0000
@@ -108,7 +108,6 @@
 THREADLIBS = @THREADLIBS@
 VERSION = @VERSION@
 addincludes = @addincludes@
-addlibs = @addlibs@
 addobjs = @addobjs@
 addtests = @addtests@
 am__include = @am__include@
@@ -134,8 +133,6 @@
     private/gc_pmark.h private/gc_locks.h \
     private/solaris_threads.h private/dbg_mlc.h \
     private/specific.h private/cord_pos.h \
-    private/pthread_support.h private/pthread_stop_world.h \
-    private/darwin_semaphore.h private/darwin_stop_world.h \
     cord.h ec.h javaxfc.h 
 
 subdir = include
Index: boehm_gc/include/gc_config_macros.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/boehm_gc/include/gc_config_macros.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 gc_config_macros.h
--- boehm_gc/include/gc_config_macros.h	27 Oct 2003 20:32:14 -0000	1.1.1.2
+++ boehm_gc/include/gc_config_macros.h	27 Oct 2003 20:38:43 -0000
@@ -19,9 +19,6 @@
 #  define GC_DGUX386_THREADS
 # endif
 #endif
-#if defined(AIX_THREADS)
-# define GC_AIX_THREADS
-#endif
 #if defined(HPUX_THREADS)
 # define GC_HPUX_THREADS
 #endif
@@ -41,7 +38,6 @@
 #if !defined(_REENTRANT) && (defined(GC_SOLARIS_THREADS) \
 		             || defined(GC_SOLARIS_PTHREADS) \
 			     || defined(GC_HPUX_THREADS) \
-			     || defined(GC_AIX_THREADS) \
 			     || defined(GC_LINUX_THREADS))
 # define _REENTRANT
 	/* Better late than never.  This fails if system headers that	*/
@@ -55,8 +51,7 @@
 # if defined(GC_SOLARIS_PTHREADS) || defined(GC_FREEBSD_THREADS) || \
 	defined(GC_IRIX_THREADS) || defined(GC_LINUX_THREADS) || \
 	defined(GC_HPUX_THREADS) || defined(GC_OSF1_THREADS) || \
-	defined(GC_DGUX386_THREADS) || defined(GC_DARWIN_THREADS) || \
-	defined(GC_AIX_THREADS) || \
+	defined(GC_DGUX386_THREADS) || defined(GC_MACOSX_THREADS) || \
         (defined(GC_WIN32_THREADS) && defined(__CYGWIN32__))
 #   define GC_PTHREADS
 # endif
@@ -84,7 +79,7 @@
 #   define GC_PTHREADS
 # endif
 # if defined(__APPLE__) && defined(__MACH__) && defined(__ppc__)
-#   define GC_DARWIN_THREADS
+#   define GC_MACOSX_THREADS
 #   define GC_PTHREADS
 # endif
 # if !defined(GC_PTHREADS) && defined(__FreeBSD__)
@@ -113,11 +108,7 @@
     typedef long ptrdiff_t;	/* ptrdiff_t is not defined */
 # endif
 
-#if defined(_DLL) && !defined(GC_NOT_DLL) && !defined(GC_DLL)
-# define GC_DLL
-#endif
-
-#if defined(__MINGW32__) && defined(GC_DLL)
+#if defined(__MINGW32__) && defined(_DLL) && !defined(GC_NOT_DLL)
 # ifdef GC_BUILD
 #   define GC_API __declspec(dllexport)
 # else
@@ -125,7 +116,9 @@
 # endif
 #endif
 
-#if (defined(__DMC__) || defined(_MSC_VER)) && defined(GC_DLL)
+#if (defined(__DMC__) || defined(_MSC_VER)) \
+		&& (defined(_DLL) && !defined(GC_NOT_DLL) \
+	            || defined(GC_DLL))
 # ifdef GC_BUILD
 #   define GC_API extern __declspec(dllexport)
 # else

----
Peter Ross
PhD Student University of Melbourne
http://www.cs.mu.oz.au/~petdr/
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------