Sat Nov 26 03:50:17 2016 UTC ()
Two fixes: (1) set ELFSIZE correctly (I have no idea how this ever worked)
and (2) work around the problem where gcc 5.x compiles calloc into a call
to itself. PKGREVISION -> 21.


(dholland)
diff -r1.54 -r1.55 pkgsrc/editors/emacs20/Makefile
diff -r1.32 -r1.33 pkgsrc/editors/emacs20/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/editors/emacs20/patches/patch-az
diff -r1.1.1.1 -r1.2 pkgsrc/editors/emacs20/patches/patch-bi
cvs diff -r1.54 -r1.55 pkgsrc/editors/emacs20/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/Makefile 2016/11/11 09:10:41 1.54
+++ pkgsrc/editors/emacs20/Makefile 2016/11/26 03:50:16 1.55
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.54 2016/11/11 09:10:41 maya Exp $ 1# $NetBSD: Makefile,v 1.55 2016/11/26 03:50:16 dholland Exp $
2 2
3DISTNAME= emacs-20.7 3DISTNAME= emacs-20.7
4PKGNAME= ${DISTNAME:S/emacs/emacs20/} 4PKGNAME= ${DISTNAME:S/emacs/emacs20/}
5PKGREVISION= 20 5PKGREVISION= 21
6CATEGORIES= editors 6CATEGORIES= editors
7MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ \ 7MASTER_SITES= http://ftp.gnu.org/pub/old-gnu/emacs/ \
8 ftp://ftp.gnu.org/pub/old-gnu/emacs 8 ftp://ftp.gnu.org/pub/old-gnu/emacs
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10DISTFILES+= ${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX} 10DISTFILES+= ${DISTNAME}-mule-4.1b-elc${EXTRACT_SUFX}
11SITES.${DISTNAME}-mule-4.1b-elc.tar.gz= ${MASTER_SITE_LOCAL} 11SITES.${DISTNAME}-mule-4.1b-elc.tar.gz= ${MASTER_SITE_LOCAL}
12 12
13# Mule enhancement (back port) patch by Satoshi Yatagawa 13# Mule enhancement (back port) patch by Satoshi Yatagawa
14SITES.emacs-20.7-mule-4.1b.patch= \ 14SITES.emacs-20.7-mule-4.1b.patch= \
15 http://www.teu.ac.jp/nsit/~yatagawa/comp/emacs/ 15 http://www.teu.ac.jp/nsit/~yatagawa/comp/emacs/
16PATCHFILES= emacs-20.7-mule-4.1b.patch 16PATCHFILES= emacs-20.7-mule-4.1b.patch
17# XIM fix patch by Seiichiro Inoue 17# XIM fix patch by Seiichiro Inoue
18SITES.emacs20-xim-20000713.diff= \ 18SITES.emacs20-xim-20000713.diff= \
cvs diff -r1.32 -r1.33 pkgsrc/editors/emacs20/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/distinfo 2015/11/03 03:32:15 1.32
+++ pkgsrc/editors/emacs20/distinfo 2016/11/26 03:50:16 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.32 2015/11/03 03:32:15 agc Exp $ 1$NetBSD: distinfo,v 1.33 2016/11/26 03:50:16 dholland Exp $
2 2
3SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff 3SHA1 (emacs-20.7-mule-4.1b-elc.tar.gz) = 3894fb2b81bb326545f6ccc3bf0a8405c23004ff
4RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f 4RMD160 (emacs-20.7-mule-4.1b-elc.tar.gz) = c675b31dafaa4321a453af9d87eddf051ee71b1f
5SHA512 (emacs-20.7-mule-4.1b-elc.tar.gz) = db4020ef7e428c99dffd3873485ce5d0ee4ad2c2bf87ec3b5f84dbf36fa2c398f3c0e02651cae3565acd2e7cbf504f66507c08b578f91247e9a27280226fb8d4 5SHA512 (emacs-20.7-mule-4.1b-elc.tar.gz) = db4020ef7e428c99dffd3873485ce5d0ee4ad2c2bf87ec3b5f84dbf36fa2c398f3c0e02651cae3565acd2e7cbf504f66507c08b578f91247e9a27280226fb8d4
6Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes 6Size (emacs-20.7-mule-4.1b-elc.tar.gz) = 70474 bytes
7SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb 7SHA1 (emacs-20.7-mule-4.1b.patch) = 2c5538198a4d032a9e987d810fe5c26407d968eb
8RMD160 (emacs-20.7-mule-4.1b.patch) = ffb90549dad55edef3042a2d68fd29d78b9cb500 8RMD160 (emacs-20.7-mule-4.1b.patch) = ffb90549dad55edef3042a2d68fd29d78b9cb500
9SHA512 (emacs-20.7-mule-4.1b.patch) = e3bb0da53c1db47b5ffbc467f5e1047896cda69b814abbbc77837f9b4ea76cb933040b22a31ee87d40c8bd66a804a1fdeb5d54f648ec040558cc4b79bc6f2368 9SHA512 (emacs-20.7-mule-4.1b.patch) = e3bb0da53c1db47b5ffbc467f5e1047896cda69b814abbbc77837f9b4ea76cb933040b22a31ee87d40c8bd66a804a1fdeb5d54f648ec040558cc4b79bc6f2368
10Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes 10Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
11SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452 11SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
12RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270 12RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
13SHA512 (emacs-20.7.tar.gz) = d782acdaa496ba5f606efa29976a00434a6e571c632f5511bc0b67cb7db7fd77aa5aedb12dac31abdced55f48170f9201cc35d6d533e2bc0a67f78bbdaa7da2a 13SHA512 (emacs-20.7.tar.gz) = d782acdaa496ba5f606efa29976a00434a6e571c632f5511bc0b67cb7db7fd77aa5aedb12dac31abdced55f48170f9201cc35d6d533e2bc0a67f78bbdaa7da2a
14Size (emacs-20.7.tar.gz) = 15043428 bytes 14Size (emacs-20.7.tar.gz) = 15043428 bytes
@@ -26,35 +26,35 @@ SHA1 (patch-ac) = abf5971279a8d875504be4 @@ -26,35 +26,35 @@ SHA1 (patch-ac) = abf5971279a8d875504be4
26SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6 26SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
27SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34 27SHA1 (patch-ae) = 465c7aff1fbb23d08ff8100993041291a9502f34
28SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca 28SHA1 (patch-af) = e7e65a2df5d55bf5bfa9dd8155b906882f620cca
29SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9 29SHA1 (patch-ag) = 14469c8907ea09395031594e7e0d0fe967b915d9
30SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455 30SHA1 (patch-ah) = 669ce7d4d2d9d15f423b94a996c0aa92b8a0d455
31SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d 31SHA1 (patch-ai) = e75ca87ba6bad1eab37cfbc99753d368fb95565d
32SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256 32SHA1 (patch-aj) = 6da7cd5925eafbfdcca14d29ae5d851e8099f256
33SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c 33SHA1 (patch-ak) = 24da025fe031da0e8f2eace8c2dd10acf7f7c82c
34SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec 34SHA1 (patch-al) = 0459e7a206bbb5f0e591111d2ed3cde97038a2ec
35SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3 35SHA1 (patch-am) = 12667ef175d1108aa3d207d92eba0f20de9d6ae3
36SHA1 (patch-ao) = bd9808c0b8026508699ebb55db8bc766bd54e193 36SHA1 (patch-ao) = bd9808c0b8026508699ebb55db8bc766bd54e193
37SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2 37SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2
38SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc 38SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc
39SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e 39SHA1 (patch-az) = a53cdfdb21e773986c9ffd2fd46e3331471ea892
40SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f 40SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f
41SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167 41SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167
42SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27 42SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
43SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346 43SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346
44SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254 44SHA1 (patch-bf) = 089ac290cbbe5c060e5300ea3ffacf8cb5ab5254
45SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8 45SHA1 (patch-bg) = bf979ed89e0d8d29bd411711a69d74cd139d8fa8
46SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a 46SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
47SHA1 (patch-bi) = d97512603b313ee730687e3b5680d45002ade51c 47SHA1 (patch-bi) = c0e237bd46de0f9ef137997e59231f119d5f791e
48SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2 48SHA1 (patch-bj) = 6dba88723ee632b67fcf6a2dd2918e69034837e2
49SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13 49SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13
50SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54 50SHA1 (patch-bm) = 2f00f63120a90477c6f5c63ac6ca23fc508b9e54
51SHA1 (patch-bp) = 7b9ad94ac9d09fbb2173fdd3efd04faa0a668a91 51SHA1 (patch-bp) = 7b9ad94ac9d09fbb2173fdd3efd04faa0a668a91
52SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e 52SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
53SHA1 (patch-bs) = d588828d66a4aa1f18a7df74bb1527e45b9c9d2a 53SHA1 (patch-bs) = d588828d66a4aa1f18a7df74bb1527e45b9c9d2a
54SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92 54SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
55SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b 55SHA1 (patch-bx) = 27713e1812240f9ed137aa793cbb5a4fa2cad33b
56SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d 56SHA1 (patch-ca) = e9c9929ea5f16ac9f4bec09f2bf8e4e28578702d
57SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b 57SHA1 (patch-cc) = 2b474603b922383b6d239e7e2e14f144bd52df6b
58SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb 58SHA1 (patch-cd) = 22b29708e0730275984dc2d8e7a304932d6b66fb
59SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2 59SHA1 (patch-ce) = df4d2a5639a72d2c719662496f17db35686f4ac2
60SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e 60SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e
cvs diff -r1.1.1.1 -r1.2 pkgsrc/editors/emacs20/patches/patch-az (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/patches/patch-az 2003/04/11 00:31:45 1.1.1.1
+++ pkgsrc/editors/emacs20/patches/patch-az 2016/11/26 03:50:16 1.2
@@ -1,75 +1,79 @@ @@ -1,75 +1,79 @@
1$NetBSD: patch-az,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $ 1$NetBSD: patch-az,v 1.2 2016/11/26 03:50:16 dholland Exp $
2 2
3--- src/unexelf.c.orig Mon May 15 01:14:02 2000 3--- src/unexelf.c.orig 2000-05-15 08:14:02.000000000 +0000
4+++ src/unexelf.c Tue Sep 26 14:18:05 2000 4+++ src/unexelf.c
5@@ -470,7 +470,7 @@ 5@@ -470,15 +470,18 @@ typedef struct {
6 /* 6 /*
7 * NetBSD does not have normal-looking user-land ELF support. 7 * NetBSD does not have normal-looking user-land ELF support.
8 */ 8 */
9-# ifdef __alpha__ 9-# ifdef __alpha__
 10+# include <sys/exec_elf.h>
 11+# if !defined(ELFSIZE)
10+# if defined(__alpha__) || defined(__sparc_v9__) 12+# if defined(__alpha__) || defined(__sparc_v9__)
11 # define ELFSIZE 64 13 # define ELFSIZE 64
12 # else 14 # else
13 # define ELFSIZE 32 15 # define ELFSIZE 32
14@@ -479,6 +479,7 @@ 16 # endif
 17-# include <sys/exec_elf.h>
 18+# endif
15  19
16 # ifndef PT_LOAD 20 # ifndef PT_LOAD
17 # define PT_LOAD Elf_pt_load 21 # define PT_LOAD Elf_pt_load
18+# define SHT_PROGBITS Elf_sht_progbits 22+# define SHT_PROGBITS Elf_sht_progbits
19 # define SHT_SYMTAB Elf_sht_symtab 23 # define SHT_SYMTAB Elf_sht_symtab
20 # define SHT_DYNSYM Elf_sht_dynsym 24 # define SHT_DYNSYM Elf_sht_dynsym
21 # define SHT_NULL Elf_sht_null 25 # define SHT_NULL Elf_sht_null
22@@ -495,9 +496,14 @@ 26@@ -495,9 +498,14 @@ typedef struct {
23 # include <sys/exec_ecoff.h> 27 # include <sys/exec_ecoff.h>
24 # define HDRR struct ecoff_symhdr 28 # define HDRR struct ecoff_symhdr
25 # define pHDRR HDRR * 29 # define pHDRR HDRR *
26-# endif 30-# endif
27+# endif /* __alpha__ */ 31+# endif /* __alpha__ */
28 #endif /* __NetBSD__ */ 32 #endif /* __NetBSD__ */
29  33
30+# ifdef __mips__ 34+# ifdef __mips__
31+# define SHT_MIPS_DEBUG DT_MIPS_FLAGS 35+# define SHT_MIPS_DEBUG DT_MIPS_FLAGS
32+# define HDRR struct Elf_Shdr 36+# define HDRR struct Elf_Shdr
33+# endif /* __mips__ */ 37+# endif /* __mips__ */
34+ 38+
35 #ifdef __OpenBSD__ 39 #ifdef __OpenBSD__
36 # include <sys/exec_elf.h> 40 # include <sys/exec_elf.h>
37 #endif 41 #endif
38@@ -512,7 +518,7 @@ 42@@ -512,7 +520,7 @@ typedef struct {
39 # else 43 # else
40 # define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type 44 # define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
41 # endif 45 # endif
42-# ifdef _LP64 46-# ifdef _LP64
43+# if defined (_LP64) || defined(__alpha__) 47+# if defined (_LP64) || defined(__alpha__)
44 # define ELFSIZE 64 48 # define ELFSIZE 64
45 # else 49 # else
46 # define ELFSIZE 32 50 # define ELFSIZE 32
47@@ -522,6 +528,14 @@ 51@@ -522,6 +530,14 @@ typedef struct {
48 # define ElfW(type) ElfExpandBitsW (ELFSIZE, type) 52 # define ElfW(type) ElfExpandBitsW (ELFSIZE, type)
49 #endif 53 #endif
50  54
51+#if defined ( __sony_news) && defined (_SYSTYPE_SYSV) 55+#if defined ( __sony_news) && defined (_SYSTYPE_SYSV)
52+# define HAVE_MIPS_SBSS 56+# define HAVE_MIPS_SBSS
53+#endif 57+#endif
54+ 58+
55+#if defined (__mips__) && (defined(__NetBSD__) || defined(__OpenBSD__)) 59+#if defined (__mips__) && (defined(__NetBSD__) || defined(__OpenBSD__))
56+# define HAVE_MIPS_SBSS 60+# define HAVE_MIPS_SBSS
57+#endif 61+#endif
58+ 62+
59 #ifndef ELF_BSS_SECTION_NAME 63 #ifndef ELF_BSS_SECTION_NAME
60 #define ELF_BSS_SECTION_NAME ".bss" 64 #define ELF_BSS_SECTION_NAME ".bss"
61 #endif 65 #endif
62@@ -613,12 +627,53 @@ 66@@ -613,12 +629,53 @@ find_section (name, section_names, file_
63 if (noerror) 67 if (noerror)
64 return -1; 68 return -1;
65 else 69 else
66- fatal ("Can't find %s in %s.\n", name, file_name, 0); 70- fatal ("Can't find %s in %s.\n", name, file_name, 0);
67+ fatal ("Can't find %s in %s.\n", name, file_name); 71+ fatal ("Can't find %s in %s.\n", name, file_name);
68 } 72 }
69  73
70 return idx; 74 return idx;
71 } 75 }
72  76
73+#if defined(__alpha__) || (defined ( __sony_news) && defined (_SYSTYPE_SYSV)) 77+#if defined(__alpha__) || (defined ( __sony_news) && defined (_SYSTYPE_SYSV))
74+/* We are using ECOFF symbols embedded in ELF. */ 78+/* We are using ECOFF symbols embedded in ELF. */
75+ 79+
@@ -104,52 +108,52 @@ $NetBSD: patch-az,v 1.1.1.1 2003/04/11 0 @@ -104,52 +108,52 @@ $NetBSD: patch-az,v 1.1.1.1 2003/04/11 0
104+ phdr->sh_addr += diff; 108+ phdr->sh_addr += diff;
105+ phdr->sh_offset += diff; 109+ phdr->sh_offset += diff;
106+ phdr->sh_size += diff; 110+ phdr->sh_size += diff;
107+ phdr->sh_link += diff; 111+ phdr->sh_link += diff;
108+ phdr->sh_info += diff; 112+ phdr->sh_info += diff;
109+ phdr->sh_addralign += diff; 113+ phdr->sh_addralign += diff;
110+ phdr->sh_entsize += diff; 114+ phdr->sh_entsize += diff;
111+}; 115+};
112+#endif /* notyet */ 116+#endif /* notyet */
113+ 117+
114 /* **************************************************************** 118 /* ****************************************************************
115 * unexec 119 * unexec
116 * 120 *
117@@ -1005,22 +1060,11 @@ 121@@ -1005,22 +1062,11 @@ unexec (new_name, old_name, data_start,
118 == 0) 122 == 0)
119 { 123 {
120 pHDRR symhdr = (pHDRR) (NEW_SECTION_H (nn).sh_offset + new_base); 124 pHDRR symhdr = (pHDRR) (NEW_SECTION_H (nn).sh_offset + new_base);
121- 125-
122- symhdr->cbLineOffset += new_data2_size; 126- symhdr->cbLineOffset += new_data2_size;
123- symhdr->cbDnOffset += new_data2_size; 127- symhdr->cbDnOffset += new_data2_size;
124- symhdr->cbPdOffset += new_data2_size; 128- symhdr->cbPdOffset += new_data2_size;
125- symhdr->cbSymOffset += new_data2_size; 129- symhdr->cbSymOffset += new_data2_size;
126- symhdr->cbOptOffset += new_data2_size; 130- symhdr->cbOptOffset += new_data2_size;
127- symhdr->cbAuxOffset += new_data2_size; 131- symhdr->cbAuxOffset += new_data2_size;
128- symhdr->cbSsOffset += new_data2_size; 132- symhdr->cbSsOffset += new_data2_size;
129- symhdr->cbSsExtOffset += new_data2_size; 133- symhdr->cbSsExtOffset += new_data2_size;
130- symhdr->cbFdOffset += new_data2_size; 134- symhdr->cbFdOffset += new_data2_size;
131- symhdr->cbRfdOffset += new_data2_size; 135- symhdr->cbRfdOffset += new_data2_size;
132- symhdr->cbExtOffset += new_data2_size; 136- symhdr->cbExtOffset += new_data2_size;
133+ relocate_ecoff_symhdr(symhdr, new_data2_size); 137+ relocate_ecoff_symhdr(symhdr, new_data2_size);
134 } 138 }
135 #endif /* __alpha__ */ 139 #endif /* __alpha__ */
136  140
137-#if defined (__sony_news) && defined (_SYSTYPE_SYSV) 141-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
138+#ifdef HAVE_MIPS_SBSS 142+#ifdef HAVE_MIPS_SBSS
139 if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG 143 if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
140 && old_mdebug_index != -1)  144 && old_mdebug_index != -1)
141 { 145 {
142@@ -1030,20 +1074,17 @@ 146@@ -1030,20 +1076,17 @@ unexec (new_name, old_name, data_start,
143  147
144 if (diff) 148 if (diff)
145 { 149 {
146- phdr->cbLineOffset += diff; 150- phdr->cbLineOffset += diff;
147- phdr->cbDnOffset += diff; 151- phdr->cbDnOffset += diff;
148- phdr->cbPdOffset += diff; 152- phdr->cbPdOffset += diff;
149- phdr->cbSymOffset += diff; 153- phdr->cbSymOffset += diff;
150- phdr->cbOptOffset += diff; 154- phdr->cbOptOffset += diff;
151- phdr->cbAuxOffset += diff; 155- phdr->cbAuxOffset += diff;
152- phdr->cbSsOffset += diff; 156- phdr->cbSsOffset += diff;
153- phdr->cbSsExtOffset += diff; 157- phdr->cbSsExtOffset += diff;
154- phdr->cbFdOffset += diff; 158- phdr->cbFdOffset += diff;
155- phdr->cbRfdOffset += diff; 159- phdr->cbRfdOffset += diff;
cvs diff -r1.1.1.1 -r1.2 pkgsrc/editors/emacs20/patches/patch-bi (expand / switch to unified diff)

--- pkgsrc/editors/emacs20/patches/patch-bi 2003/04/11 00:31:45 1.1.1.1
+++ pkgsrc/editors/emacs20/patches/patch-bi 2016/11/26 03:50:16 1.2
@@ -1,13 +1,31 @@ @@ -1,13 +1,31 @@
1$NetBSD: patch-bi,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $ 1$NetBSD: patch-bi,v 1.2 2016/11/26 03:50:16 dholland Exp $
2 2
3--- ./src/gmalloc.c.orig Mon Feb 21 05:21:51 2000 3Work around bug in gcc 5.x that makes calloc into a call to itself,
4+++ ./src/gmalloc.c Tue Sep 26 09:44:47 2000 4resulting in an infinite loop.
5@@ -371,7 +371,7 @@ 5
 6--- src/gmalloc.c.orig 2000-02-21 13:21:51.000000000 +0000
 7+++ src/gmalloc.c
 8@@ -371,7 +371,7 @@ __malloc_size_t _bytes_free;
6 /* Are you experienced? */ 9 /* Are you experienced? */
7 int __malloc_initialized; 10 int __malloc_initialized;
8  11
9-__malloc_size_t __malloc_extra_blocks; 12-__malloc_size_t __malloc_extra_blocks;
10+__malloc_size_t __malloc_extra_blocks = 0; 13+__malloc_size_t __malloc_extra_blocks = 0;
11  14
12 void (*__malloc_initialize_hook) PP ((void)); 15 void (*__malloc_initialize_hook) PP ((void));
13 void (*__after_morecore_hook) PP ((void)); 16 void (*__after_morecore_hook) PP ((void));
 17@@ -1420,7 +1420,13 @@ calloc (nmemb, size)
 18 register __malloc_size_t nmemb;
 19 register __malloc_size_t size;
 20 {
 21- register __ptr_t result = malloc (nmemb * size);
 22+ register __ptr_t result;
 23+
 24+ result = malloc (nmemb * size);
 25+#ifdef __GNUC__
 26+/* Work around a gcc bug that converts calloc into a call to itself. */
 27+ __asm volatile("" : "+r" (result));
 28+#endif
 29
 30 if (result != NULL)
 31 (void) memset (result, 0, nmemb * size);