diff options
author | jlam <jlam> | 2000-06-20 21:47:20 +0000 |
---|---|---|
committer | jlam <jlam> | 2000-06-20 21:47:20 +0000 |
commit | db23d36814a6916df87707d60d9648c5d44ca3c5 (patch) | |
tree | 472d5481f2866f0cd4ee245ad282c9e7430d133f /devel/boehm-gc/patches | |
parent | 2d980bd59fc8b40830e27fa54208674b30f34674 (diff) | |
download | pkgsrc-db23d36814a6916df87707d60d9648c5d44ca3c5.tar.gz |
Update boehm-gc to 5.0alpha7. Changes from 5.0alpha3 are mostly bugfixes
but there is the addition of the NetBSD/arm32 bits.
This has been tested on mac68k, macppc, sparc ELF, i386 ELF.
Update provided in PR#10062 by Sunagawa Keiki <kei_sun@ba2.so-net.ne.jp>.
Diffstat (limited to 'devel/boehm-gc/patches')
-rw-r--r-- | devel/boehm-gc/patches/patch-aa | 54 | ||||
-rw-r--r-- | devel/boehm-gc/patches/patch-ac | 30 | ||||
-rw-r--r-- | devel/boehm-gc/patches/patch-ad | 15 | ||||
-rw-r--r-- | devel/boehm-gc/patches/patch-ag | 29 |
4 files changed, 68 insertions, 60 deletions
diff --git a/devel/boehm-gc/patches/patch-aa b/devel/boehm-gc/patches/patch-aa index 127b30db942..750c34ad22a 100644 --- a/devel/boehm-gc/patches/patch-aa +++ b/devel/boehm-gc/patches/patch-aa @@ -1,18 +1,19 @@ -$NetBSD: patch-aa,v 1.6 1999/12/28 04:57:49 wiz Exp $ ---- Makefile.orig Sat Sep 11 08:49:18 1999 -+++ Makefile Tue Oct 26 10:48:45 1999 -@@ -9,8 +9,8 @@ - # cord/de - builds dumb editor based on cords. - ABI_FLAG= +$NetBSD: patch-aa,v 1.7 2000/06/20 21:47:22 jlam Exp $ + +--- Makefile.orig Thu Apr 13 15:00:20 2000 ++++ Makefile Tue Jun 20 04:02:12 2000 +@@ -10,8 +10,8 @@ + ABI_FLAG= CC=cc $(ABI_FLAG) --CXX=CC $(ABI_FLAG) + HOSTCC=$(CC) +-CXX=g++ $(ABI_FLAG) -AS=as $(ABI_FLAG) +CXX=c++ $(ABI_FLAG) +AS=gcc -c -x assembler-with-cpp $(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) -@@ -18,6 +18,25 @@ +@@ -19,6 +19,25 @@ CFLAGS= -O -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DALL_INTERIOR_POINTERS -DSILENT @@ -21,11 +22,11 @@ $NetBSD: patch-aa,v 1.6 1999/12/28 04:57:49 wiz Exp $ +BSD-pkg-all: bsd-libgc.a bsd-libleak.a + +bsd-libgc.a: -+ make CFLAGS="$(CFLAGS)" clean c++-t ++ $(MAKE) CFLAGS="$(CFLAGS)" clean c++-t + mv gc.a bsd-libgc.a + +bsd-libleak.a: -+ make CFLAGS="$(LEAKFLAGS)" clean c++-nt ++ $(MAKE) CFLAGS="$(LEAKFLAGS)" clean c++-nt + mv gc.a bsd-libleak.a + +BSD-pkg-install: BSD-pkg-all @@ -38,26 +39,31 @@ $NetBSD: patch-aa,v 1.6 1999/12/28 04:57:49 wiz Exp $ # For dynamic library builds, it may be necessary to add flags to generate # PIC code, e.g. -fPIC on Linux. -@@ -163,7 +182,7 @@ - threadlibs.c if_mach.c if_not_there.c gc_cpp.cc gc_cpp.h weakpointer.h \ +@@ -181,7 +200,7 @@ gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h gc_alloc.h \ include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \ -- solaris_threads.h backptr.h $(CORD_SRCS) -+ sparc_netbsd_mach_dep.s solaris_threads.h backptr.h $(CORD_SRCS) + solaris_threads.h backptr.h hpux_test_and_clear.s include/gc_gcj.h \ +- dbg_mlc.h $(CORD_SRCS) ++ dbg_mlc.h sparc_netbsd_mach_dep.s $(CORD_SRCS) OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \ README test.c test_cpp.cc setjmp_t.c SMakefile.amiga \ -@@ -202,8 +221,6 @@ +@@ -220,11 +239,9 @@ # not time-critical anyway. # Set SPECIALCFLAGS to -q nodirect_code on Encore. -all: gc.a gctest - pcr: PCR-Makefile gc_private.h gc_hdrs.h gc.h gcconfig.h mach_dep.o $(SRCS) - make -f PCR-Makefile depend - make -f PCR-Makefile -@@ -245,6 +262,12 @@ - ./if_mach HP_PA "" $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld +- make -f PCR-Makefile depend +- make -f PCR-Makefile ++ $(MAKE) -f PCR-Makefile depend ++ $(MAKE) -f PCR-Makefile + + $(OBJS) test.o dyn_load.o dyn_load_sunos53.o: $(srcdir)/gc_priv.h $(srcdir)/gc_hdrs.h $(srcdir)/gc.h \ + $(srcdir)/gcconfig.h $(srcdir)/gc_typed.h Makefile +@@ -263,6 +280,12 @@ + ./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs` ./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/test_cpp.cc gc_cpp.o gc.a `./threadlibs` +c++-t: c++ @@ -69,7 +75,7 @@ $NetBSD: patch-aa,v 1.6 1999/12/28 04:57:49 wiz Exp $ c++: gc_cpp.o $(srcdir)/gc_cpp.h test_cpp rm -f dont_ar_4 ./if_mach SPARC SUNOS5 touch dont_ar_4 -@@ -253,7 +276,6 @@ +@@ -271,7 +294,6 @@ ./if_mach M68K AMIGA $(AR) -vrus gc.a gc_cpp.o ./if_not_there dont_ar_4 $(AR) ru gc.a gc_cpp.o ./if_not_there dont_ar_4 $(RANLIB) gc.a || cat /dev/null @@ -77,11 +83,11 @@ $NetBSD: patch-aa,v 1.6 1999/12/28 04:57:49 wiz Exp $ echo > c++ dyn_load_sunos53.o: dyn_load.c -@@ -302,6 +324,7 @@ +@@ -322,6 +344,7 @@ ./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 ./if_mach SPARC OPENBSD $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s + ./if_mach SPARC NETBSD $(AS) -o mach_dep.o $(srcdir)/sparc_netbsd_mach_dep.s - ./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c - - mark_rts.o: $(srcdir)/mark_rts.c if_mach if_not_there $(UTILS) + ./if_mach HP_PA HPUX $(AS) -o hpux_test_and_clear.o $(srcdir)/hpux_test_and_clear.s + ./if_mach HP_PA HPUX $(CC) -c -o md_tmp.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c + ./if_mach HP_PA HPUX ld -r -o mach_dep.o md_tmp.o hpux_test_and_clear.o diff --git a/devel/boehm-gc/patches/patch-ac b/devel/boehm-gc/patches/patch-ac index fff2208e7c9..3ab195cda27 100644 --- a/devel/boehm-gc/patches/patch-ac +++ b/devel/boehm-gc/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ +$NetBSD: patch-ac,v 1.5 2000/06/20 21:47:22 jlam Exp $ ---- gcconfig.h.orig Wed Sep 15 13:56:31 1999 -+++ gcconfig.h Mon Dec 27 23:38:55 1999 +--- gcconfig.h.orig Wed Apr 26 09:41:01 2000 ++++ gcconfig.h Sat May 6 04:39:48 2000 @@ -27,6 +27,11 @@ # define LINUX # endif @@ -25,8 +25,8 @@ $NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ +# define POWERPC # define mach_type_known # endif - # if defined(vax) -@@ -106,7 +114,7 @@ + # if defined(__NetBSD__) && defined(arm32) +@@ -114,7 +122,7 @@ # define mach_type_known # endif # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \ @@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ # define SPARC # define DRSNX # define mach_type_known -@@ -115,6 +123,10 @@ +@@ -123,6 +131,10 @@ # define RS6000 # define mach_type_known # endif @@ -46,7 +46,7 @@ $NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ # if defined(_M_XENIX) && defined(_M_SYSV) && defined(_M_I386) /* The above test may need refinement */ # define I386 -@@ -153,7 +165,7 @@ +@@ -172,7 +184,7 @@ # endif # if defined(__alpha) || defined(__alpha__) # define ALPHA @@ -55,7 +55,7 @@ $NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ # define OSF1 /* a.k.a Digital Unix */ # endif # define mach_type_known -@@ -202,7 +214,6 @@ +@@ -221,7 +233,6 @@ # endif # if defined(__NetBSD__) && defined(i386) # define I386 @@ -63,7 +63,7 @@ $NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ # define mach_type_known # endif # if defined(bsdi) && defined(i386) -@@ -527,6 +538,14 @@ +@@ -573,6 +584,14 @@ # define STACKBOTTOM ((ptr_t) 0xc0000000) # define DATAEND /* not needed */ # endif @@ -78,7 +78,7 @@ $NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ # endif # ifdef VAX -@@ -556,7 +575,6 @@ +@@ -602,7 +621,6 @@ # define MACH_TYPE "SPARC" # define ALIGNMENT 4 /* Required by hardware */ # define ALIGN_DOUBLE @@ -86,7 +86,7 @@ $NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ # ifdef SUNOS5 # define OS_TYPE "SUNOS5" extern int _etext; -@@ -628,8 +646,20 @@ +@@ -674,8 +692,20 @@ # ifdef OPENBSD # define OS_TYPE "OPENBSD" # define STACKBOTTOM ((ptr_t) 0xf8000000) @@ -107,10 +107,10 @@ $NetBSD: patch-ac,v 1.4 1999/12/28 14:07:43 minoura Exp $ # endif # ifdef I386 -@@ -919,6 +949,16 @@ - # ifdef ALPHA - # define MACH_TYPE "ALPHA" - # define ALIGNMENT 8 +@@ -1019,6 +1049,16 @@ + /* fp registers in some cases when the target is a 21264. The assembly */ + /* code doesn't handle that yet, and version dependencies make that a */ + /* bit tricky. Do the easy thing for now. */ +# ifdef NETBSD +# define OS_TYPE "NETBSD" +# define HEURISTIC2 diff --git a/devel/boehm-gc/patches/patch-ad b/devel/boehm-gc/patches/patch-ad index 136d655e84c..887612d614a 100644 --- a/devel/boehm-gc/patches/patch-ad +++ b/devel/boehm-gc/patches/patch-ad @@ -1,18 +1,18 @@ -$NetBSD: patch-ad,v 1.1 1999/09/24 16:42:06 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2000/06/20 21:47:22 jlam Exp $ ---- dyn_load.c.orig 1999/06/02 19:29:13 1.1.1.2 -+++ dyn_load.c 1999/06/03 12:44:49 1.2 -@@ -48,7 +48,8 @@ +--- dyn_load.c.orig Wed Apr 26 09:01:16 2000 ++++ dyn_load.c Sat May 6 04:48:00 2000 +@@ -50,7 +50,8 @@ #if !defined(SUNOS4) && !defined(SUNOS5DL) && !defined(IRIX5) && \ !defined(MSWIN32) && !(defined(ALPHA) && defined(OSF1)) && \ - !defined(HP_PA) && !(defined(LINUX) && defined(__ELF__)) && \ + !defined(HPUX) && !(defined(LINUX) && defined(__ELF__)) && \ - !defined(RS6000) && !defined(SCO_ELF) + !defined(RS6000) && !defined(SCO_ELF) && \ + !(defined(NETBSD) && defined(__ELF__)) --> We only know how to find data segments of dynamic libraries for the --> above. Additional SVR4 variants might not be too --> hard to add. -@@ -260,14 +261,22 @@ +@@ -297,14 +298,19 @@ # endif /* !USE_PROC ... */ # endif /* SUNOS */ @@ -27,9 +27,6 @@ $NetBSD: patch-ad,v 1.1 1999/09/24 16:42:06 jlam Exp $ +#if defined(NETBSD) +#include <sys/exec_elf.h> -+#define DT_DEBUG 21 -+#define PT_LOAD 1 -+#define PF_W 0x2 +#else #include <elf.h> +#endif diff --git a/devel/boehm-gc/patches/patch-ag b/devel/boehm-gc/patches/patch-ag index b572853f92c..7af9cc875ef 100644 --- a/devel/boehm-gc/patches/patch-ag +++ b/devel/boehm-gc/patches/patch-ag @@ -1,22 +1,27 @@ -$NetBSD: patch-ag,v 1.1 1999/09/24 16:42:06 jlam Exp $ +$NetBSD: patch-ag,v 1.2 2000/06/20 21:47:23 jlam Exp $ ---- mach_dep.c.orig Sun Jun 27 06:26:50 1999 -+++ mach_dep.c Wed Sep 22 17:39:42 1999 -@@ -197,6 +197,8 @@ +--- mach_dep.c.orig Sat Apr 15 05:57:14 2000 ++++ mach_dep.c Sat May 6 04:59:30 2000 +@@ -220,8 +220,10 @@ + # if defined(I386) &&!defined(OS2) &&!defined(SVR4) \ + && (defined(__MINGW32__) || !defined(MSWIN32)) \ && !defined(SCO) && !defined(SCO_ELF) \ - && !(defined(LINUX) && defined(__ELF__)) \ - && !(defined(__FreeBSD__) && defined(__ELF__)) \ -+ && !(defined(__NetBSD__) && defined(__ELF__)) \ -+ && !(defined(__OpenBSD__) && defined(__ELF__)) \ +- && !(defined(LINUX) && defined(__ELF__)) \ ++ && !(defined(LINUX) && defined(__ELF__)) \ + && !(defined(FREEBSD) && defined(__ELF__)) \ ++ && !(defined(NETBSD) && defined(__ELF__)) \ ++ && !(defined(OPENBSD) && defined(__ELF__)) \ && !defined(DOS4GW) /* I386 code, generic code does not appear to work */ /* It does appear to work under OS2, and asms dont */ -@@ -212,6 +214,8 @@ +@@ -236,7 +238,9 @@ + # endif # if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \ - || ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) ) -+ || ( defined(I386) && defined(__NetBSD__) && defined(__ELF__) ) -+ || ( defined(I386) && defined(__OpenBSD__) && defined(__ELF__) ) +- || ( defined(I386) && defined(FREEBSD) && defined(__ELF__) ) ++ || ( defined(I386) && defined(FREEBSD) && defined(__ELF__) ) \ ++ || ( defined(I386) && defined(NETBSD) && defined(__ELF__) ) \ ++ || ( defined(I386) && defined(OPENBSD) && defined(__ELF__) ) /* This is modified for Linux with ELF (Note: _ELF_ only) */ /* This section handles FreeBSD with ELF. */ |