diff options
author | sakamoto <sakamoto@pkgsrc.org> | 1999-09-28 07:20:45 +0000 |
---|---|---|
committer | sakamoto <sakamoto@pkgsrc.org> | 1999-09-28 07:20:45 +0000 |
commit | 60fc38f7a4926a3d250da2ecb114e081f8e86dcf (patch) | |
tree | e4066780a1faa0432ea7bf7ffbe8dd6d44c78cf3 /www | |
parent | d57bc8e1daa4df8ea5c06fb8d131275a41ed7ba9 (diff) | |
download | pkgsrc-60fc38f7a4926a3d250da2ecb114e081f8e86dcf.tar.gz |
Remove unnecessary patch for gc.
Diffstat (limited to 'www')
-rw-r--r-- | www/w3m/files/patch-sum | 6 | ||||
-rw-r--r-- | www/w3m/patches/patch-ab | 44 | ||||
-rw-r--r-- | www/w3m/patches/patch-ac | 117 | ||||
-rw-r--r-- | www/w3m/patches/patch-ad | 20 | ||||
-rw-r--r-- | www/w3m/patches/patch-ae | 33 |
5 files changed, 1 insertions, 219 deletions
diff --git a/www/w3m/files/patch-sum b/www/w3m/files/patch-sum index f64b9ff0238..a1223057bab 100644 --- a/www/w3m/files/patch-sum +++ b/www/w3m/files/patch-sum @@ -1,8 +1,4 @@ -$NetBSD: patch-sum,v 1.2 1999/09/27 11:19:59 agc Exp $ +$NetBSD: patch-sum,v 1.3 1999/09/28 07:20:45 sakamoto Exp $ MD5 (patch-aa) = dcf53ec4037cd17b9d96f9f1ce90f6bc -MD5 (patch-ab) = be8a7df0633e7d0011f48d87023205d6 -MD5 (patch-ac) = 1314c9fd7eb6ae3eccc1bf1102922a09 -MD5 (patch-ad) = 849e642550068f099e7a60db8456b8f8 -MD5 (patch-ae) = b8fac1576ac82a565d301aba59efa60b MD5 (patch-ai) = 7df7383d051fdf8ee6d2ecca5114dc9d diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab deleted file mode 100644 index 8f515cdf37e..00000000000 --- a/www/w3m/patches/patch-ab +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1999/09/27 11:18:59 agc Exp $ - -Index: gc/dyn_load.c -=================================================================== -RCS file: /cvsroot/w3m/gc/dyn_load.c,v -retrieving revision 1.1.1.2 -retrieving revision 1.2 -diff -u -u -r1.1.1.2 -r1.2 ---- gc/dyn_load.c 1999/06/02 19:29:13 1.1.1.2 -+++ gc/dyn_load.c 1999/06/03 12:44:49 1.2 -@@ -48,7 +48,8 @@ - #if !defined(SUNOS4) && !defined(SUNOS5DL) && !defined(IRIX5) && \ - !defined(MSWIN32) && !(defined(ALPHA) && defined(OSF1)) && \ - !defined(HP_PA) && !(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 @@ - # endif /* !USE_PROC ... */ - # endif /* SUNOS */ - --#if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) -+#if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \ -+ (defined(NETBSD) && defined(__ELF__)) - - /* Dynamic loading code for Linux running ELF. Somewhat tested on - * Linux/x86, untested but hopefully should work on Linux/Alpha. - * This code was derived from the Solaris/ELF support. Thanks to - * whatever kind soul wrote that. - Patrick Bridges */ - -+#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 - #include <link.h> - - /* Newer versions of Linux/Alpha and Linux/x86 define this macro. We diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac deleted file mode 100644 index f22b0898acf..00000000000 --- a/www/w3m/patches/patch-ac +++ /dev/null @@ -1,117 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/09/27 05:37:36 sakamoto Exp $ - ---- gc/gcconfig.h.orig Fri Jul 9 05:03:22 1999 -+++ gc/gcconfig.h Tue Sep 21 08:46:36 1999 -@@ -27,6 +27,12 @@ - # define LINUX - # endif - -+/* NetBSD no longer defines symbol unix */ -+# if defined(__NetBSD__) -+# define NETBSD -+# define unix -+# endif -+ - /* Determine the machine type: */ - # if defined(sun) && defined(mc68000) - # define M68K -@@ -50,7 +56,10 @@ - # endif - # if defined(__NetBSD__) && defined(m68k) - # define M68K --# define NETBSD -+# define mach_type_known -+# endif -+# if defined(__NetBSD__) && defined(__powerpc__) -+# define POWERPC - # define mach_type_known - # endif - # if defined(vax) -@@ -106,11 +115,15 @@ - # define mach_type_known - # endif - # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \ -- && !defined(__OpenBSD__) -+ && !defined(__OpenBSD__) && !defined(__NetBSD__) - # define SPARC - # define DRSNX - # define mach_type_known - # endif -+# if defined(__NetBSD__) && defined(__sparc__) -+# define SPARC -+# define mach_type_known -+# endif - # if defined(_IBMR2) - # define RS6000 - # define mach_type_known -@@ -154,7 +167,7 @@ - # endif - # if defined(__alpha) || defined(__alpha__) - # define ALPHA --# if !defined(LINUX) -+# if !defined(LINUX) && !defined(NETBSD) - # define OSF1 /* a.k.a Digital Unix */ - # endif - # define mach_type_known -@@ -203,7 +216,6 @@ - # endif - # if defined(__NetBSD__) && defined(i386) - # define I386 --# define NETBSD - # define mach_type_known - # endif - # if defined(bsdi) && defined(i386) -@@ -614,6 +626,7 @@ - # define DYNAMIC_LOADING - # endif - # ifdef LINUX -+# define ALIGNMENT 2 - # define OS_TYPE "LINUX" - # ifdef __ELF__ - # define DATASTART GC_data_start -@@ -631,6 +644,19 @@ - # define STACKBOTTOM ((ptr_t) 0xf8000000) - # define DATASTART ((ptr_t)(&etext)) - # endif -+# ifdef NETBSD -+# define ALIGNMENT 4 -+# define OS_TYPE "NETBSD" -+# define HEURISTIC2 -+ extern char etext; -+# define DATASTART GC_data_start -+# define DYNAMIC_LOADING -+# endif -+# ifdef NETBSD -+# define OS_TYPE "NETBSD" -+# define HEURISTIC2 -+# define DATASTART ((ptr_t)(&etext)) -+# endif - # endif - - # ifdef I386 -@@ -917,6 +943,16 @@ - # ifdef ALPHA - # define MACH_TYPE "ALPHA" - # define ALIGNMENT 8 -+# ifdef NETBSD -+# define OS_TYPE "NETBSD" -+# define HEURISTIC2 -+# define DATASTART GC_data_start -+# define ELFCLASS32 32 -+# define ELFCLASS64 64 -+# define ELF_CLASS ELFCLASS64 -+# define CPP_WORDSZ 64 -+# define DYNAMIC_LOADING -+# endif - # ifdef OSF1 - # define OS_TYPE "OSF1" - # define DATASTART ((ptr_t) 0x140000000) -@@ -1088,7 +1124,7 @@ - /* Use setjmp based hack to mark from callee-save registers. */ - # define USE_GENERIC_PUSH_REGS - # endif --# if defined(SPARC) && !defined(LINUX) -+# if defined(SPARC) && !defined(LINUX) && !defined(NETBSD) - # define SAVE_CALL_CHAIN - # define ASM_CLEAR_CODE /* Stack clearing is crucial, and we */ - /* include assembly code to do it well. */ diff --git a/www/w3m/patches/patch-ad b/www/w3m/patches/patch-ad deleted file mode 100644 index caea09841e7..00000000000 --- a/www/w3m/patches/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ad,v 1.2 1999/09/27 11:18:59 agc Exp $ - -Index: gc/misc.c -=================================================================== -RCS file: /cvsroot/w3m/gc/misc.c,v -retrieving revision 1.1.1.1 -retrieving revision 1.2 -diff -u -u -r1.1.1.1 -r1.2 ---- gc/misc.c 1999/06/02 19:23:56 1.1.1.1 -+++ gc/misc.c 1999/06/03 12:44:50 1.2 -@@ -433,6 +433,9 @@ - # if defined(LINUX) && defined(SPARC) - GC_init_linuxsparc(); - # endif -+# if defined(NETBSD) && defined(__ELF__) -+ GC_init_netbsd_elf(); -+# endif - # ifdef SOLARIS_THREADS - GC_thr_init(); - /* We need dirty bits in order to find live stack sections. */ diff --git a/www/w3m/patches/patch-ae b/www/w3m/patches/patch-ae deleted file mode 100644 index 25597af154d..00000000000 --- a/www/w3m/patches/patch-ae +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 1999/09/27 05:37:36 sakamoto Exp $ - ---- gc/os_dep.c.orig Wed May 19 17:38:53 1999 -+++ gc/os_dep.c Tue Jun 8 01:25:18 1999 -@@ -165,6 +165,19 @@ - } - #endif - -+#if defined(NETBSD) && defined(__ELF__) -+ ptr_t GC_data_start; -+ -+ void GC_init_netbsd_elf() -+ { -+ extern ptr_t GC_find_limit(); -+ extern char **environ; -+ /* This may need to be environ, without the underscore, for */ -+ /* some versions. */ -+ GC_data_start = GC_find_limit((ptr_t)&environ, FALSE); -+ } -+#endif -+ - # ifdef OS2 - - # include <stddef.h> -@@ -2234,7 +2247,7 @@ - * Call stack save code for debugging. - * Should probably be in mach_dep.c, but that requires reorganization. - */ --#if defined(SPARC) && !defined(LINUX) -+#if defined(SPARC) && !defined(LINUX) && !defined(NETBSD) - # if defined(SUNOS4) - # include <machine/frame.h> - # else |