API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Apr 27th, 2017
634
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 55.36 KB | None | 0 0
raw download clone embed print report
  1. Index: Makefile
  2. ===================================================================
  3. RCS file: /cvsroot/pkgsrc/editors/mule/Makefile,v
  4. retrieving revision 1.51
  5. diff -u -p -d -r1.51 Makefile
  6. --- Makefile 4 Jul 2015 16:18:29 -0000 1.51
  7. +++ Makefile 27 Apr 2017 16:07:10 -0000
  8. @@ -25,7 +25,7 @@ GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMAN
  9.  
  10. .include "../../mk/bsd.prefs.mk"
  11.  
  12. -CFLAGS+= -g
  13. +CFLAGS+= -g -fno-builtin-malloc -fno-strict-aliasing
  14.  
  15. CONFIGURE_ARGS+= ${MACHINE_ARCH}--${LOWER_OPSYS} --with-x --with-x-toolkit=lucid
  16. CONFIGURE_ARGS+= --terminal-face --mcpath --canna-libraries=${PREFIX}/lib
  17. Index: distinfo
  18. ===================================================================
  19. RCS file: /cvsroot/pkgsrc/editors/mule/distinfo,v
  20. retrieving revision 1.14
  21. diff -u -p -d -r1.14 distinfo
  22. --- distinfo 3 Nov 2015 03:32:18 -0000 1.14
  23. +++ distinfo 27 Apr 2017 16:07:10 -0000
  24. @@ -4,8 +4,8 @@ SHA1 (mule-2.3.tar.gz) = 52737767955caf2
  25. RMD160 (mule-2.3.tar.gz) = 52b93e746a7a796549a44104ab1898954df044bf
  26. SHA512 (mule-2.3.tar.gz) = 5f6a9047e6c9d752787d6cab3573516c6efd65cd901fbab74d314a5967e6c68b2dc7c2aa7454d8588d421553530c87dd3ee9692d523d818e01739580cb1201fd
  27. Size (mule-2.3.tar.gz) = 10240256 bytes
  28. -SHA1 (patch-aa) = 927ec514204ef97101fb3f4ab77eec1c71af23f1
  29. -SHA1 (patch-ab) = 7c2cf683e87320190af0306cf7d04b3638600944
  30. +SHA1 (patch-aa) = 4beddc75ea9d58423d62a9ff786a6c2b60caadca
  31. +SHA1 (patch-ab) = da4f43df6bddba83909989e60c1c0342f5d9d6ef
  32. SHA1 (patch-ac) = 170fa4f6c17c805dd32a90e8bfb3e38c48a9fc20
  33. SHA1 (patch-ad) = 7a52802cd614441320221f450cf97d4e30f40f2b
  34. SHA1 (patch-ae) = 1f020aaeb75cd7dd2b827ab34382e472add09719
  35. @@ -75,7 +75,7 @@ SHA1 (patch-lib-src_profile_c) = b4e74a5
  36. SHA1 (patch-lib-src_sorted-doc_c) = 9965f6a6722c2735dfc609a7a15c669f3df8fae4
  37. SHA1 (patch-lib-src_yow_c) = 38fb3e70395525ce8bb4816acd1b9e64c20f3735
  38. SHA1 (patch-src_abbrev_c) = c8dc21ca974625b8fe20e96bea37c61f709fbc1a
  39. -SHA1 (patch-src_alloc_c) = a5db486e10072ec3738df001aa555e35ae5a5a07
  40. +SHA1 (patch-src_alloc_c) = aaa4315c2487e3b32deb13940609fbcf4b895bce
  41. SHA1 (patch-src_buffer_h) = 3d2d0dba98a37265cc4df54bd14b6b51941d9c42
  42. SHA1 (patch-src_bytecode_c) = 93508ddb17e3ba2c7bb921caf85ce1e4e15791f3
  43. SHA1 (patch-src_callint_c) = 0b44807e049c12d2625c950efb14fd5409aba058
  44. Index: patches/patch-aa
  45. ===================================================================
  46. RCS file: /cvsroot/pkgsrc/editors/mule/patches/patch-aa,v
  47. retrieving revision 1.2
  48. diff -u -p -d -r1.2 patch-aa
  49. --- patches/patch-aa 1 Dec 2005 18:13:24 -0000 1.2
  50. +++ patches/patch-aa 27 Apr 2017 16:07:10 -0000
  51. @@ -1,6 +1,6 @@
  52. $NetBSD: patch-aa,v 1.2 2005/12/01 18:13:24 wiz Exp $
  53.  
  54. ---- src/s/netbsd.h.orig 1995-10-12 11:53:15.000000000 +0100
  55. +--- src/s/netbsd.h.orig 1995-10-12 10:53:15.000000000 +0000
  56. +++ src/s/netbsd.h
  57. @@ -3,6 +3,10 @@
  58. /* Get most of the stuff from bsd4.3 */
  59. @@ -13,18 +13,21 @@ $NetBSD: patch-aa,v 1.2 2005/12/01 18:13
  60. /* For mem-limits.h. */
  61. #define BSD4_2
  62.  
  63. -@@ -30,8 +34,8 @@
  64. +@@ -30,9 +34,10 @@
  65. #define NO_TERMIO
  66.  
  67. #define LIBS_DEBUG
  68. -/* -lutil is not needed for NetBSD >0.9. */
  69. -#define LIBS_SYSTEM -lutil -lcrypt
  70. +-#define LIBS_TERMCAP -ltermcap
  71. +#define LIBS_SYSTEM -lcrypt
  72. +
  73. - #define LIBS_TERMCAP -ltermcap
  74. ++#define TERMINFO
  75. ++#define LIBS_TERMCAP -lterminfo
  76.  
  77. #define NEED_ERRNO
  78. -@@ -40,7 +44,9 @@
  79. + #define SYSV_SYSTEM_DIR
  80. +@@ -40,7 +45,9 @@
  81. /* Netbsd has POSIX-style pgrp behavior. */
  82. #undef BSD_PGRPS
  83.  
  84. @@ -35,7 +38,7 @@ $NetBSD: patch-aa,v 1.2 2005/12/01 18:13
  85. /* These definitions should work for either dynamic or static linking,
  86. whichever is the default for `cc -nostdlib'. */
  87. #define HAVE_TEXT_START /* No need to define `start_of_text'. */
  88. -@@ -54,14 +60,34 @@
  89. +@@ -54,14 +61,34 @@
  90. #define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data))
  91. #define N_TRELOFF(x) N_RELOFF(x)
  92. #endif
  93. Index: patches/patch-ab
  94. ===================================================================
  95. RCS file: /cvsroot/pkgsrc/editors/mule/patches/patch-ab,v
  96. retrieving revision 1.3
  97. diff -u -p -d -r1.3 patch-ab
  98. --- patches/patch-ab 24 Dec 2011 17:07:07 -0000 1.3
  99. +++ patches/patch-ab 27 Apr 2017 16:07:10 -0000
  100. @@ -1,9 +1,10 @@
  101. $NetBSD: patch-ab,v 1.3 2011/12/24 17:07:07 dholland Exp $
  102.  
  103. ---- src/unexelf.c.orig 1994-10-21 05:21:00.000000000 +0100
  104. +--- src/unexelf.c.orig 1994-10-21 04:21:00.000000000 +0000
  105. +++ src/unexelf.c
  106. @@ -1,19 +1,22 @@
  107. - /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992
  108. +-/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992
  109. ++/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 01, 02
  110. Free Software Foundation, Inc.
  111.  
  112. - This program is free software; you can redistribute it and/or modify
  113. @@ -57,245 +58,36 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  114. *
  115. * The boundaries within the a.out file may be adjusted with the data_start
  116. * and bss_start arguments. Either or both may be given as 0 for defaults.
  117. -@@ -98,64 +101,64 @@ temacs:
  118. - Link Info Adralgn Entsize
  119. -
  120. - [1] 1 2 0x80480d4 0xd4 0x13 .interp
  121. -- 0 0 0x1 0
  122. -+ 0 0 0x1 0
  123. -
  124. - [2] 5 2 0x80480e8 0xe8 0x388 .hash
  125. -- 3 0 0x4 0x4
  126. -+ 3 0 0x4 0x4
  127. -
  128. - [3] 11 2 0x8048470 0x470 0x7f0 .dynsym
  129. -- 4 1 0x4 0x10
  130. -+ 4 1 0x4 0x10
  131. -
  132. - [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
  133. -- 0 0 0x1 0
  134. -+ 0 0 0x1 0
  135. -
  136. - [5] 9 2 0x8049010 0x1010 0x338 .rel.plt
  137. -- 3 7 0x4 0x8
  138. -+ 3 7 0x4 0x8
  139. -
  140. - [6] 1 6 0x8049348 0x1348 0x3 .init
  141. -- 0 0 0x4 0
  142. -+ 0 0 0x4 0
  143. -
  144. - [7] 1 6 0x804934c 0x134c 0x680 .plt
  145. -- 0 0 0x4 0x4
  146. -+ 0 0 0x4 0x4
  147. -
  148. - [8] 1 6 0x80499cc 0x19cc 0x3c56f .text
  149. -- 0 0 0x4 0
  150. -+ 0 0 0x4 0
  151. -
  152. - [9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
  153. -- 0 0 0x4 0
  154. -+ 0 0 0x4 0
  155. -
  156. - [10] 1 2 0x8085f40 0x3df40 0x69c .rodata
  157. -- 0 0 0x4 0
  158. -+ 0 0 0x4 0
  159. -
  160. - [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
  161. -- 0 0 0x4 0
  162. -+ 0 0 0x4 0
  163. -
  164. - [12] 1 3 0x8088330 0x3f330 0x20afc .data
  165. -- 0 0 0x4 0
  166. -+ 0 0 0x4 0
  167. -
  168. - [13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
  169. -- 0 0 0x4 0
  170. -+ 0 0 0x4 0
  171. -
  172. - [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
  173. -- 0 0 0x4 0x4
  174. -+ 0 0 0x4 0x4
  175. -
  176. - [15] 6 3 0x80a9874 0x60874 0x80 .dynamic
  177. -- 4 0 0x4 0x8
  178. -+ 4 0 0x4 0x8
  179. -
  180. - [16] 8 3 0x80a98f4 0x608f4 0x449c .bss
  181. -- 0 0 0x4 0
  182. -+ 0 0 0x4 0
  183. -
  184. - [17] 2 0 0 0x608f4 0x9b90 .symtab
  185. -- 18 371 0x4 0x10
  186. -+ 18 371 0x4 0x10
  187. -
  188. - [18] 3 0 0 0x6a484 0x8526 .strtab
  189. -- 0 0 0x1 0
  190. -+ 0 0 0x1 0
  191. -
  192. - [19] 3 0 0 0x729aa 0x93 .shstrtab
  193. -- 0 0 0x1 0
  194. -+ 0 0 0x1 0
  195. -
  196. - [20] 1 0 0 0x72a3d 0x68b7 .comment
  197. -- 0 0 0x1 0
  198. -+ 0 0 0x1 0
  199. -
  200. - raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
  201. -
  202. -@@ -166,67 +169,67 @@ xemacs:
  203. - Link Info Adralgn Entsize
  204. -
  205. - [1] 1 2 0x80480d4 0xd4 0x13 .interp
  206. -- 0 0 0x1 0
  207. -+ 0 0 0x1 0
  208. -
  209. - [2] 5 2 0x80480e8 0xe8 0x388 .hash
  210. -- 3 0 0x4 0x4
  211. -+ 3 0 0x4 0x4
  212. -
  213. - [3] 11 2 0x8048470 0x470 0x7f0 .dynsym
  214. -- 4 1 0x4 0x10
  215. -+ 4 1 0x4 0x10
  216. -
  217. - [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
  218. -- 0 0 0x1 0
  219. -+ 0 0 0x1 0
  220. -
  221. - [5] 9 2 0x8049010 0x1010 0x338 .rel.plt
  222. -- 3 7 0x4 0x8
  223. -+ 3 7 0x4 0x8
  224. -
  225. - [6] 1 6 0x8049348 0x1348 0x3 .init
  226. -- 0 0 0x4 0
  227. -+ 0 0 0x4 0
  228. -
  229. - [7] 1 6 0x804934c 0x134c 0x680 .plt
  230. -- 0 0 0x4 0x4
  231. -+ 0 0 0x4 0x4
  232. -
  233. - [8] 1 6 0x80499cc 0x19cc 0x3c56f .text
  234. -- 0 0 0x4 0
  235. -+ 0 0 0x4 0
  236. -
  237. - [9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
  238. -- 0 0 0x4 0
  239. -+ 0 0 0x4 0
  240. -
  241. - [10] 1 2 0x8085f40 0x3df40 0x69c .rodata
  242. -- 0 0 0x4 0
  243. -+ 0 0 0x4 0
  244. -
  245. - [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
  246. -- 0 0 0x4 0
  247. -+ 0 0 0x4 0
  248. -
  249. - [12] 1 3 0x8088330 0x3f330 0x20afc .data
  250. -- 0 0 0x4 0
  251. -+ 0 0 0x4 0
  252. -
  253. - [13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
  254. -- 0 0 0x4 0
  255. -+ 0 0 0x4 0
  256. -
  257. - [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
  258. -- 0 0 0x4 0x4
  259. -+ 0 0 0x4 0x4
  260. -
  261. - [15] 6 3 0x80a9874 0x60874 0x80 .dynamic
  262. -- 4 0 0x4 0x8
  263. -+ 4 0 0x4 0x8
  264. -
  265. - [16] 8 3 0x80c6800 0x7d800 0 .bss
  266. -- 0 0 0x4 0
  267. -+ 0 0 0x4 0
  268. -
  269. - [17] 2 0 0 0x7d800 0x9b90 .symtab
  270. -- 18 371 0x4 0x10
  271. -+ 18 371 0x4 0x10
  272. -
  273. - [18] 3 0 0 0x87390 0x8526 .strtab
  274. -- 0 0 0x1 0
  275. -+ 0 0 0x1 0
  276. -
  277. - [19] 3 0 0 0x8f8b6 0x93 .shstrtab
  278. -- 0 0 0x1 0
  279. -+ 0 0 0x1 0
  280. -
  281. - [20] 1 0 0 0x8f949 0x68b7 .comment
  282. -- 0 0 0x1 0
  283. -+ 0 0 0x1 0
  284. -
  285. - [21] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
  286. -- 0 0 0x4 0
  287. -+ 0 0 0x4 0
  288. -
  289. - * This is an example of how the file header is changed. "Shoff" is
  290. - * the section header offset within the file. Since that table is
  291. -@@ -276,20 +279,20 @@ temacs:
  292. - Type Offset Vaddr Paddr
  293. - Filesz Memsz Flags Align
  294. -
  295. --6 0x34 0x8048034 0
  296. --0xa0 0xa0 5 0
  297. -+6 0x34 0x8048034 0
  298. -+0xa0 0xa0 5 0
  299. -
  300. --3 0xd4 0 0
  301. --0x13 0 4 0
  302. -+3 0xd4 0 0
  303. -+0x13 0 4 0
  304. -
  305. --1 0x34 0x8048034 0
  306. --0x3f2f9 0x3f2f9 5 0x1000
  307. -+1 0x34 0x8048034 0
  308. -+0x3f2f9 0x3f2f9 5 0x1000
  309. -
  310. --1 0x3f330 0x8088330 0
  311. --0x215c4 0x25a60 7 0x1000
  312. -+1 0x3f330 0x8088330 0
  313. -+0x215c4 0x25a60 7 0x1000
  314. -
  315. --2 0x60874 0x80a9874 0
  316. --0x80 0 7 0
  317. -+2 0x60874 0x80a9874 0
  318. -+0x80 0 7 0
  319. -
  320. - raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
  321. -
  322. -@@ -298,42 +301,42 @@ xemacs:
  323. - Type Offset Vaddr Paddr
  324. - Filesz Memsz Flags Align
  325. -
  326. --6 0x34 0x8048034 0
  327. --0xa0 0xa0 5 0
  328. -+6 0x34 0x8048034 0
  329. -+0xa0 0xa0 5 0
  330. -
  331. --3 0xd4 0 0
  332. --0x13 0 4 0
  333. -+3 0xd4 0 0
  334. -+0x13 0 4 0
  335. -
  336. --1 0x34 0x8048034 0
  337. --0x3f2f9 0x3f2f9 5 0x1000
  338. -+1 0x34 0x8048034 0
  339. -+0x3f2f9 0x3f2f9 5 0x1000
  340. -
  341. --1 0x3f330 0x8088330 0
  342. --0x3e4d0 0x3e4d0 7 0x1000
  343. -+1 0x3f330 0x8088330 0
  344. -+0x3e4d0 0x3e4d0 7 0x1000
  345. +@@ -49,11 +52,6 @@ what you give them. Help stamp out sof
  346. + * The value you specify may be rounded down to a suitable boundary
  347. + * as required by the machine you are using.
  348. + *
  349. +- * Specifying zero for data_start means the boundary between text and data
  350. +- * should not be the same as when the program was loaded.
  351. +- * If NO_REMAP is defined, the argument data_start is ignored and the
  352. +- * segment boundaries are never changed.
  353. +- *
  354. + * Bss_start indicates how much of the data segment is to be saved in the
  355. + * a.out file and restored when the program is executed. It gives the lowest
  356. + * unsaved address, and is rounded up to a page boundary. The default when 0
  357. +@@ -63,9 +61,6 @@ what you give them. Help stamp out sof
  358. + *
  359. + * The new file is set up to start at entry_address.
  360. + *
  361. +- * If you make improvements I'd like to get them too.
  362. +- * harpo!utah-cs!thomas, thomas@Utah-20
  363. +- *
  364. + */
  365.  
  366. --2 0x60874 0x80a9874 0
  367. --0x80 0 7 0
  368. -+2 0x60874 0x80a9874 0
  369. -+0x80 0 7 0
  370. + /* Even more heavily modified by james@bigtex.cactus.org of Dell Computer Co.
  371. +@@ -315,25 +310,25 @@ Filesz Memsz Flags Alig
  372.  
  373.  
  374. */
  375. -
  376. +-
  377. -/* Modified by wtien@urbana.mcd.mot.com of Motorola Inc.
  378. - *
  379. ++
  380. +/* Modified by wtien@urbana.mcd.mot.com of Motorola Inc.
  381. + *
  382. * The above mechanism does not work if the unexeced ELF file is being
  383. @@ -325,7 +117,7 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  384. * 1. ELF header e_shstrndx field.
  385. * 2. section header sh_link and sh_info field.
  386. * 3. symbol table entry st_shndx field.
  387. -@@ -345,67 +348,67 @@ Filesz Memsz Flags Alig
  388. +@@ -345,85 +340,214 @@ Filesz Memsz Flags Alig
  389. Link Info Adralgn Entsize
  390.  
  391. [1] 1 2 0x80480d4 0xd4 0x13 .interp
  392. @@ -414,7 +206,35 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  393.  
  394. */
  396. -@@ -417,15 +420,130 @@ Filesz Memsz Flags Alig
  397. ++/*
  398. ++ * Modified by rdh@yottayotta.com of Yotta Yotta Incorporated.
  399. ++ *
  400. ++ * The code originally used mmap() to create a memory image of the new
  401. ++ * and old object files. This had a few handy features: (1) you get
  402. ++ * to use a cool system call like mmap, (2) no need to explicitly
  403. ++ * write out the new file before the close, and (3) no swap space
  404. ++ * requirements. Unfortunately, mmap() often fails to work with
  405. ++ * nfs-mounted file systems.
  406. ++ *
  407. ++ * So, instead of relying on the vm subsystem to do the file i/o for
  408. ++ * us, it's now done explicitly. A buffer of the right size for the
  409. ++ * file is dynamically allocated, and either the old_name is read into
  410. ++ * it, or it is initialized with the correct new executable contents,
  411. ++ * and then written to new_name.
  412. ++ */
  413. ++
  414. ++#ifndef emacs
  415. ++#define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)
  416. ++#include <string.h>
  417. ++#else
  418. ++#include "config.h"
  419. ++#endif
  420. ++
  421. + #include <sys/types.h>
  422. + #include <stdio.h>
  423. + #include <sys/stat.h>
  424. + #include <memory.h>
  425. +-#include <string.h>
  426. #include <errno.h>
  427. #include <unistd.h>
  428. #include <fcntl.h>
  429. @@ -422,10 +242,34 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  430. #include <elf.h>
  431. +#endif
  432. #include <sys/mman.h>
  433. +-
  434. +-#ifndef emacs
  435. +-#define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)
  436. +#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
  437. +#include <sys/elf_mips.h>
  438. +#include <sym.h>
  439. +#endif /* __sony_news && _SYSTYPE_SYSV */
  440. ++#if __sgi
  441. ++#include <syms.h> /* for HDRR declaration */
  442. ++#endif /* __sgi */
  443. ++
  444. ++#ifndef MAP_ANON
  445. ++#ifdef MAP_ANONYMOUS
  446. ++#define MAP_ANON MAP_ANONYMOUS
  447. + #else
  448. +-extern void fatal (char *, ...);
  449. ++#define MAP_ANON 0
  450. ++#endif
  451. ++#endif
  452. ++
  453. ++#ifdef MCPATH /* hir, 1993.8.4 */
  454. ++#undef open
  455. ++#undef chmod
  456. ++#endif
  457. ++
  458. ++#ifndef MAP_FAILED
  459. ++#define MAP_FAILED ((void *) -1)
  460. ++#endif
  461. +
  462. +#if defined (__alpha__) && !defined (__NetBSD__) && !defined (__OpenBSD__)
  463. +/* Declare COFF debugging symbol table. This used to be in
  464. @@ -466,51 +310,27 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  465. +/*
  466. + * NetBSD does not have normal-looking user-land ELF support.
  467. + */
  468. -+# if defined(__alpha__) || defined(__x86_64__) || defined(__sparc64__) || defined(_LP64)
  469. -+# define ELFSIZE 64
  470. -+# else
  471. -+# define ELFSIZE 32
  472. -+# endif
  473. +# include <sys/exec_elf.h>
  474. +
  475. -+#ifndef PT_LOAD
  476. -+# define PT_LOAD Elf_pt_load
  477. -+# define SHT_SYMTAB Elf_sht_symtab
  478. -+# define SHT_DYNSYM Elf_sht_dynsym
  479. -+# define SHT_NULL Elf_sht_null
  480. -+# define SHT_NOBITS Elf_sht_nobits
  481. -+# define SHT_REL Elf_sht_rel
  482. -+# define SHT_RELA Elf_sht_rela
  483. -+
  484. -+# define SHN_UNDEF Elf_eshn_undefined
  485. -+# define SHN_ABS Elf_eshn_absolute
  486. -+# define SHN_COMMON Elf_eshn_common
  487. -+#endif
  488. -+
  489. -+/*
  490. -+ * The magic of picking the right size types is handled by the ELFSIZE
  491. -+ * definition above.
  492. -+ */
  493. -+# ifdef __STDC__
  494. -+# define ElfW(type) Elf_##type
  495. -+# else
  496. -+# define ElfW(type) Elf_/**/type
  497. -+# endif
  498. -+
  499. -+# ifdef __alpha__
  500. -+# include <sys/exec_ecoff.h>
  501. -+# define HDRR struct ecoff_symhdr
  502. -+# define pHDRR HDRR *
  503. -+# endif /* __alpha__*/
  504. ++# ifndef PT_LOAD
  505. ++# define PT_LOAD Elf_pt_load
  506. ++# if 0 /* was in pkgsrc patches for 20.7 */
  507. ++# define SHT_PROGBITS Elf_sht_progbits
  508. ++# endif
  509. ++# define SHT_SYMTAB Elf_sht_symtab
  510. ++# define SHT_DYNSYM Elf_sht_dynsym
  511. ++# define SHT_NULL Elf_sht_null
  512. ++# define SHT_NOBITS Elf_sht_nobits
  513. ++# define SHT_REL Elf_sht_rel
  514. ++# define SHT_RELA Elf_sht_rela
  515. +
  516. -+# ifdef __mips__
  517. -+# define SHT_MIPS_DEBUG DT_MIPS_FLAGS
  518. -+# define HDRR struct Elf_Shdr
  519. -+# endif /* __mips__ */
  520. ++# define SHN_UNDEF Elf_eshn_undefined
  521. ++# define SHN_ABS Elf_eshn_absolute
  522. ++# define SHN_COMMON Elf_eshn_common
  523. ++# endif /* !PT_LOAD */
  524. +
  525. +#endif /* __NetBSD__ */
  526. +
  527. -+
  528. +#ifdef __OpenBSD__
  529. +# include <sys/exec_elf.h>
  530. +#endif
  531. @@ -521,35 +341,28 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  532. +
  533. +#ifndef ElfW
  534. +# ifdef __STDC__
  535. -+# define ElfW(type) Elf32_##type
  536. ++# define ElfBitsW(bits, type) Elf##bits##_##type
  537. +# else
  538. -+# define ElfW(type) Elf32_/**/type
  539. ++# define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
  540. +# endif
  541. -+#endif
  542. -
  543. - #ifndef emacs
  544. - #define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1)
  545. - #else
  546. -+#include <config.h>
  547. - extern void fatal (char *, ...);
  548. ++# ifndef ELFSIZE
  549. ++# ifdef _LP64
  550. ++# define ELFSIZE 64
  551. ++# else
  552. ++# define ELFSIZE 32
  553. ++# endif
  554. ++# endif
  555. ++ /* This macro expands `bits' before invoking ElfBitsW. */
  556. ++# define ElfExpandBitsW(bits, type) ElfBitsW (bits, type)
  557. ++# define ElfW(type) ElfExpandBitsW (ELFSIZE, type)
  558. #endif
  559.  
  560. -+#if defined ( __sony_news) && defined (_SYSTYPE_SYSV)
  561. -+# define HAVE_MIPS_SBSS
  562. -+#endif
  563. -+
  564. -+#if (defined (__mips__) || defined (__powerpc__)) && (defined(__NetBSD__) || defined(__OpenBSD__))
  565. -+# define HAVE_MIPS_SBSS
  566. -+#endif
  567. -+
  568. #ifndef ELF_BSS_SECTION_NAME
  569. - #define ELF_BSS_SECTION_NAME ".bss"
  570. - #endif
  571. -@@ -433,15 +551,38 @@ extern void fatal (char *, ...);
  572. +@@ -433,15 +557,38 @@ extern void fatal (char *, ...);
  573. /* Get the address of a particular section or program header entry,
  574. * accounting for the size of the entries.
  575. */
  576. -+/*
  577. ++/*
  578. + On PPC Reference Platform running Solaris 2.5.1
  579. + the plt section is also of type NOBI like the bss section.
  580. + (not really stored) and therefore sections after the bss
  581. @@ -558,7 +371,7 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  582. + Thus, we modify the test from
  583. + if (NEW_SECTION_H (nn).sh_offset >= new_data2_offset)
  584. + to
  585. -+ if (NEW_SECTION_H (nn).sh_offset >=
  586. ++ if (NEW_SECTION_H (nn).sh_offset >=
  587. + OLD_SECTION_H (old_bss_index-1).sh_offset)
  588. + This is just a hack. We should put the new data section
  589. + before the .plt section.
  590. @@ -588,67 +401,78 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  591.  
  592. #define PATCH_INDEX(n) \
  593. do { \
  594. -@@ -451,9 +592,9 @@ typedef unsigned char byte;
  595. +@@ -451,9 +598,8 @@ typedef unsigned char byte;
  596.  
  597. /* Round X up to a multiple of Y. */
  598.  
  599. -int
  600. -+ElfW(Addr)
  601. - round_up (x, y)
  602. +-round_up (x, y)
  603. - int x, y;
  604. -+ ElfW(Addr) x, y;
  605. ++static ElfW(Addr)
  606. ++round_up (ElfW(Addr) x, ElfW(Addr) y)
  607. {
  608. int rem = x % y;
  609. if (rem == 0)
  610. -@@ -461,6 +602,47 @@ round_up (x, y)
  611. +@@ -461,6 +607,39 @@ round_up (x, y)
  612. return x - rem + y;
  613. }
  614.  
  615. -+#if defined(__alpha__) || (defined ( __sony_news) && defined (_SYSTYPE_SYSV))
  616. -+/* We are using ECOFF symbols embedded in ELF. */
  617. ++/* Return the index of the section named NAME.
  618. ++ SECTION_NAMES, FILE_NAME and FILE_H give information
  619. ++ about the file we are looking in.
  620. +
  621. -+void
  622. -+relocate_ecoff_symhdr(symhdr, diff)
  623. -+ HDRR *symhdr;
  624. -+ ElfW(Word) diff;
  625. -+{
  626. -+ symhdr->cbLineOffset += diff;
  627. -+ symhdr->cbDnOffset += diff;
  628. -+ symhdr->cbPdOffset += diff;
  629. -+ symhdr->cbSymOffset += diff;
  630. -+ symhdr->cbOptOffset += diff;
  631. -+ symhdr->cbAuxOffset += diff;
  632. -+ symhdr->cbSsOffset += diff;
  633. -+ symhdr->cbSsExtOffset += diff;
  634. -+ symhdr->cbFdOffset += diff;
  635. -+ symhdr->cbRfdOffset += diff;
  636. -+ symhdr->cbExtOffset += diff;
  637. -+}
  638. -+#endif /* __alpha__ or __sony_news and systype_sysv */
  639. ++ If we don't find the section NAME, that is a fatal error
  640. ++ if NOERROR is 0; we return -1 if NOERROR is nonzero. */
  641. +
  642. -+#ifdef notyet
  643. -+void
  644. -+relocate_elf_proghdr(p, diff)
  645. -+ HDRR *symhdr;
  646. -+ ElfW(Word) diff;
  647. ++static int
  648. ++find_section (char *name, char *section_names, char *file_name, ElfW(Ehdr) *old_file_h, ElfW(Shdr) *old_section_h, int noerror)
  649. +{
  650. -+ phdr->sh_name += diff;
  651. -+ phdr->sh_type += diff;
  652. -+ phdr->sh_flags += diff;
  653. -+ phdr->sh_addr += diff;
  654. -+ phdr->sh_offset += diff;
  655. -+ phdr->sh_size += diff;
  656. -+ phdr->sh_link += diff;
  657. -+ phdr->sh_info += diff;
  658. -+ phdr->sh_addralign += diff;
  659. -+ phdr->sh_entsize += diff;
  660. -+};
  661. -+#endif /* notyet */
  662. ++ int idx;
  663. ++
  664. ++ for (idx = 1; idx < old_file_h->e_shnum; idx++)
  665. ++ {
  666. ++#ifdef DEBUG
  667. ++ fprintf (stderr, "Looking for %s - found %s\n", name,
  668. ++ section_names + OLD_SECTION_H (idx).sh_name);
  669. ++#endif
  670. ++ if (!strcmp (section_names + OLD_SECTION_H (idx).sh_name,
  671. ++ name))
  672. ++ break;
  673. ++ }
  674. ++ if (idx == old_file_h->e_shnum)
  675. ++ {
  676. ++ if (noerror)
  677. ++ return -1;
  678. ++ else
  679. ++ fatal ("Can't find %s in %s.\n", name, file_name);
  680. ++ }
  681. ++
  682. ++ return idx;
  683. ++}
  684. +
  685. /* ****************************************************************
  686. * unexec
  687. *
  688. -@@ -483,19 +665,23 @@ unexec (new_name, old_name, data_start,
  689. +@@ -471,34 +650,45 @@ round_up (x, y)
  690. + *
  691. + */
  692. + void
  693. +-unexec (new_name, old_name, data_start, bss_start, entry_address)
  694. +- char *new_name, *old_name;
  695. +- unsigned data_start, bss_start, entry_address;
  696. ++unexec (char *new_name, char *old_name, unsigned data_start, unsigned bss_start, unsigned entry_address)
  697. + {
  698. + int new_file, old_file, new_file_size;
  699. +
  700. + /* Pointers to the base of the image of the two files. */
  701. + caddr_t old_base, new_base;
  702. +
  703. ++#if MAP_ANON == 0
  704. ++ int mmap_fd;
  705. ++#else
  706. ++# define mmap_fd -1
  707. ++#endif
  708. ++
  709. /* Pointers to the file, program and section headers for the old and new
  710. * files.
  711. */
  712. @@ -666,30 +490,57 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  713. - Elf32_Word old_bss_size, new_data2_size;
  714. - Elf32_Off new_data2_offset;
  715. - Elf32_Addr new_data2_addr;
  716. +-
  717. +- int n, nn, old_bss_index, old_data_index, new_data2_index;
  718. + ElfW(Addr) old_bss_addr, new_bss_addr;
  719. + ElfW(Word) old_bss_size, new_data2_size;
  720. + ElfW(Off) new_data2_offset;
  721. + ElfW(Addr) new_data2_addr;
  722. -
  723. - int n, nn, old_bss_index, old_data_index, new_data2_index;
  724. -+#ifdef HAVE_MIPS_SBSS
  725. -+ int old_sbss_index, old_mdebug_index;
  726. -+ int bss_phdr_index;
  727. -+#endif /* HAVE_MIPS_SBSS */
  728. ++ ElfW(Off) old_bss_offset;
  729. ++ ElfW(Word) new_data2_incr, new_data2_shincr;
  730. ++
  731. ++ int n, nn;
  732. ++ int old_bss_index, old_sbss_index;
  733. ++ int old_data_index, new_data2_index;
  734. ++ int old_mdebug_index;
  735. struct stat stat_buf;
  736. ++ int old_file_size;
  737.  
  738. - /* Open the old file & map it into the address space. */
  739. -@@ -508,7 +694,8 @@ unexec (new_name, old_name, data_start,
  740. +- /* Open the old file & map it into the address space. */
  741. ++ /* Open the old file, allocate a buffer of the right size, and read
  742. ++ * in the file contents. */
  743. +
  744. + old_file = open (old_name, O_RDONLY);
  745. +
  746. +@@ -508,90 +698,127 @@ unexec (new_name, old_name, data_start,
  747. if (fstat (old_file, &stat_buf) == -1)
  748. fatal ("Can't fstat (%s): errno %d\n", old_name, errno);
  749.  
  750. - old_base = mmap (0, stat_buf.st_size, PROT_READ, MAP_SHARED, old_file, 0);
  751. -+ old_base = mmap ((caddr_t) 0, stat_buf.st_size, PROT_READ, MAP_SHARED,
  752. -+ old_file, 0);
  753. ++#if MAP_ANON == 0
  754. ++ mmap_fd = open ("/dev/zero", O_RDONLY);
  755. ++ if (mmap_fd < 0)
  756. ++ fatal ("Can't open /dev/zero for reading: errno %d\n", errno);
  757. ++#endif
  758.  
  759. - if (old_base == (caddr_t) -1)
  760. - fatal ("Can't mmap (%s): errno %d\n", old_name, errno);
  761. -@@ -520,9 +707,9 @@ unexec (new_name, old_name, data_start,
  762. +- if (old_base == (caddr_t) -1)
  763. +- fatal ("Can't mmap (%s): errno %d\n", old_name, errno);
  764. ++ /* We cannot use malloc here because that may use sbrk. If it does,
  765. ++ we'd dump our temporary buffers with Emacs, and we'd have to be
  766. ++ extra careful to use the correct value of sbrk(0) after
  767. ++ allocating all buffers in the code below, which we aren't. */
  768. ++ old_file_size = stat_buf.st_size;
  769. ++ old_base = mmap (NULL, old_file_size, PROT_READ | PROT_WRITE,
  770. ++ MAP_ANON | MAP_PRIVATE, mmap_fd, 0);
  771. ++ if (old_base == MAP_FAILED)
  772. ++ fatal ("Can't allocate buffer for %s\n", old_name);
  773. +
  774. +-#ifdef DEBUG
  775. +- fprintf (stderr, "mmap (%s, %x) -> %x\n", old_name, stat_buf.st_size,
  776. +- old_base);
  777. +-#endif
  778. ++ if (read (old_file, old_base, stat_buf.st_size) != stat_buf.st_size)
  779. ++ fatal ("Didn't read all of %s: errno %d\n", old_name, errno);
  780.  
  781. /* Get pointers to headers & section names */
  782.  
  783. @@ -702,57 +553,61 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  784. old_section_names = (char *) old_base
  785. + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset;
  786.  
  787. -@@ -544,16 +731,61 @@ unexec (new_name, old_name, data_start,
  788. - if (old_bss_index == old_file_h->e_shnum)
  789. - fatal ("Can't find .bss in %s.\n", old_name, 0);
  790. ++ /* Find the mdebug section, if any. */
  791. ++
  792. ++ old_mdebug_index = find_section (".mdebug", old_section_names,
  793. ++ old_name, old_file_h, old_section_h, 1);
  794. ++
  795. + /* Find the old .bss section. Figure out parameters of the new
  796. + * data2 and bss sections.
  797. + */
  798.  
  799. -+#ifdef HAVE_MIPS_SBSS
  800. -+ for (old_sbss_index = 1; old_sbss_index < (int) old_file_h->e_shnum;
  801. -+ old_sbss_index++)
  802. -+ {
  803. -+#ifdef DEBUG
  804. -+ fprintf (stderr, "Looking for .sbss - found %s\n",
  805. -+ old_section_names + OLD_SECTION_H (old_sbss_index).sh_name);
  806. -+#endif
  807. -+ if (!strcmp (old_section_names + OLD_SECTION_H (old_sbss_index).sh_name,
  808. -+ ".sbss"))
  809. -+ break;
  810. -+ }
  811. -+ if (old_sbss_index == old_file_h->e_shnum)
  812. -+ {
  813. -+ old_bss_addr = OLD_SECTION_H(old_bss_index).sh_addr;
  814. -+ old_bss_size = OLD_SECTION_H(old_bss_index).sh_size;
  815. -+ new_data2_offset = OLD_SECTION_H(old_bss_index).sh_offset;
  816. +- for (old_bss_index = 1; old_bss_index < (int) old_file_h->e_shnum;
  817. +- old_bss_index++)
  818. ++ old_bss_index = find_section (".bss", old_section_names,
  819. ++ old_name, old_file_h, old_section_h, 0);
  820. ++
  821. ++ old_sbss_index = find_section (".sbss", old_section_names,
  822. ++ old_name, old_file_h, old_section_h, 1);
  823. ++ if (old_sbss_index != -1)
  824. ++ if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
  825. ++ old_sbss_index = -1;
  826. ++
  827. ++ if (old_sbss_index == -1)
  828. + {
  829. +-#ifdef DEBUG
  830. +- fprintf (stderr, "Looking for .bss - found %s\n",
  831. +- old_section_names + OLD_SECTION_H (old_bss_index).sh_name);
  832. +-#endif
  833. +- if (!strcmp (old_section_names + OLD_SECTION_H (old_bss_index).sh_name,
  834. +- ELF_BSS_SECTION_NAME))
  835. +- break;
  836. ++ old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
  837. ++ old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
  838. ++ old_bss_offset = OLD_SECTION_H (old_bss_index).sh_offset;
  839. + new_data2_index = old_bss_index;
  840. + }
  841. + else
  842. + {
  843. -+ old_bss_addr = OLD_SECTION_H(old_sbss_index).sh_addr;
  844. -+ old_bss_size = OLD_SECTION_H(old_bss_index).sh_size
  845. -+ + OLD_SECTION_H(old_sbss_index).sh_size;
  846. -+ new_data2_offset = OLD_SECTION_H(old_sbss_index).sh_offset;
  847. ++ old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
  848. ++ old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
  849. ++ + OLD_SECTION_H (old_sbss_index).sh_size;
  850. ++ old_bss_offset = OLD_SECTION_H (old_sbss_index).sh_offset;
  851. + new_data2_index = old_sbss_index;
  852. -+ }
  853. -+
  854. -+ for (old_mdebug_index = 1; old_mdebug_index < (int) old_file_h->e_shnum;
  855. -+ old_mdebug_index++)
  856. -+ {
  857. -+#ifdef DEBUG
  858. -+ fprintf (stderr, "Looking for .mdebug - found %s\n",
  859. -+ old_section_names + OLD_SECTION_H (old_mdebug_index).sh_name);
  860. -+#endif
  861. -+ if (!strcmp (old_section_names + OLD_SECTION_H (old_mdebug_index).sh_name,
  862. -+ ".mdebug"))
  863. -+ break;
  864. -+ }
  865. -+ if (old_mdebug_index == old_file_h->e_shnum)
  866. -+ old_mdebug_index = 0;
  867. -+#else /* not HAVE_MIPS_SBSS */
  868. - old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
  869. - old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
  870. + }
  871. +- if (old_bss_index == old_file_h->e_shnum)
  872. +- fatal ("Can't find .bss in %s.\n", old_name, 0);
  873. +
  874. +- old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
  875. +- old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
  876. -#if defined(emacs) || !defined(DEBUG)
  877. - new_bss_addr = (Elf32_Addr) sbrk (0);
  878. -+#endif /* not HAVE_MIPS_SBSS */
  879. ++ /* Find the old .data section. Figure out parameters of
  880. ++ the new data2 and bss sections. */
  881. ++
  882. ++ old_data_index = find_section (".data", old_section_names,
  883. ++ old_name, old_file_h, old_section_h, 0);
  884. ++
  885. +#if defined (emacs) || !defined (DEBUG)
  886. + new_bss_addr = (ElfW(Addr)) sbrk (0);
  887. #else
  888. @@ -760,72 +615,131 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  889. #endif
  890. new_data2_addr = old_bss_addr;
  891. new_data2_size = new_bss_addr - old_bss_addr;
  892. -+#ifndef HAVE_MIPS_SBSS
  893. - new_data2_offset = OLD_SECTION_H (old_bss_index).sh_offset;
  894. -+#endif /* not HAVE_MIPS_SBSS */
  895. +- new_data2_offset = OLD_SECTION_H (old_bss_index).sh_offset;
  896. ++ new_data2_offset = OLD_SECTION_H (old_data_index).sh_offset
  897. ++ + (new_data2_addr - OLD_SECTION_H (old_data_index).sh_addr);
  898. ++ /* This is the amount by which the sections following the bss sections
  899. ++ must be shifted in the image. It can differ from new_data2_size if
  900. ++ the end of the old .data section (and thus the offset of the .bss
  901. ++ section) was unaligned. */
  902. ++ new_data2_incr = new_data2_size + (new_data2_offset - old_bss_offset);
  903. ++ new_data2_shincr = round_up(new_data2_incr, old_program_h->p_align);
  904.  
  905. #ifdef DEBUG
  906. fprintf (stderr, "old_bss_index %d\n", old_bss_index);
  907. -@@ -582,15 +814,20 @@ unexec (new_name, old_name, data_start,
  908. + fprintf (stderr, "old_bss_addr %x\n", old_bss_addr);
  909. + fprintf (stderr, "old_bss_size %x\n", old_bss_size);
  910. ++ fprintf (stderr, "old_bss_offset %x\n", old_bss_offset);
  911. + fprintf (stderr, "new_bss_addr %x\n", new_bss_addr);
  912. + fprintf (stderr, "new_data2_addr %x\n", new_data2_addr);
  913. + fprintf (stderr, "new_data2_size %x\n", new_data2_size);
  914. + fprintf (stderr, "new_data2_offset %x\n", new_data2_offset);
  915. ++ fprintf (stderr, "new_data2_incr %x\n", new_data2_incr);
  916. + #endif
  917. +
  918. + if ((unsigned) new_bss_addr < (unsigned) old_bss_addr + old_bss_size)
  919. + fatal (".bss shrank when undumping???\n", 0, 0);
  920. +
  921. +- /* Set the output file to the right size and mmap it. Set
  922. +- * pointers to various interesting objects. stat_buf still has
  923. +- * old_file data.
  924. ++ /* Set the output file to the right size. Allocate a buffer to hold
  925. ++ * the image of the new file. Set pointers to various interesting
  926. ++ * objects. stat_buf still has old_file data.
  927. + */
  928. +
  929. + new_file = open (new_name, O_RDWR | O_CREAT, 0666);
  930. + if (new_file < 0)
  931. + fatal ("Can't creat (%s): errno %d\n", new_name, errno);
  932. +
  933. +- new_file_size = stat_buf.st_size + old_file_h->e_shentsize + new_data2_size;
  934. ++ new_file_size = stat_buf.st_size + old_file_h->e_shentsize + new_data2_shincr;
  935. +
  936. if (ftruncate (new_file, new_file_size))
  937. fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno);
  938.  
  939. - new_base = mmap (0, new_file_size, PROT_READ | PROT_WRITE, MAP_SHARED,
  940. - new_file, 0);
  941. -+#ifdef UNEXEC_USE_MAP_PRIVATE
  942. -+ new_base = mmap ((caddr_t) 0, new_file_size, PROT_READ | PROT_WRITE,
  943. -+ MAP_PRIVATE, new_file, 0);
  944. -+#else
  945. -+ new_base = mmap ((caddr_t) 0, new_file_size, PROT_READ | PROT_WRITE,
  946. -+ MAP_SHARED, new_file, 0);
  947. -+#endif
  948. -
  949. - if (new_base == (caddr_t) -1)
  950. - fatal ("Can't mmap (%s): errno %d\n", new_name, errno);
  951. -
  952. +-
  953. +- if (new_base == (caddr_t) -1)
  954. +- fatal ("Can't mmap (%s): errno %d\n", new_name, errno);
  955. +-
  956. - new_file_h = (Elf32_Ehdr *) new_base;
  957. - new_program_h = (Elf32_Phdr *) ((byte *) new_base + old_file_h->e_phoff);
  958. - new_section_h = (Elf32_Shdr *)
  959. +- ((byte *) new_base + old_file_h->e_shoff + new_data2_size);
  960. ++ new_base = mmap (NULL, new_file_size, PROT_READ | PROT_WRITE,
  961. ++ MAP_ANON | MAP_PRIVATE, mmap_fd, 0);
  962. ++ if (new_base == MAP_FAILED)
  963. ++ fatal ("Can't allocate buffer for %s\n", old_name);
  964. ++
  965. + new_file_h = (ElfW(Ehdr) *) new_base;
  966. + new_program_h = (ElfW(Phdr) *) ((byte *) new_base + old_file_h->e_phoff);
  967. + new_section_h = (ElfW(Shdr) *)
  968. - ((byte *) new_base + old_file_h->e_shoff + new_data2_size);
  969. ++ ((byte *) new_base + old_file_h->e_shoff + new_data2_shincr);
  970.  
  971. /* Make our new file, program and section headers as copies of the
  972. -@@ -633,8 +870,14 @@ unexec (new_name, old_name, data_start,
  973. + * originals.
  974. +@@ -608,7 +835,7 @@ unexec (new_name, old_name, data_start,
  975. + * further away now.
  976. + */
  977. +
  978. +- new_file_h->e_shoff += new_data2_size;
  979. ++ new_file_h->e_shoff += new_data2_shincr;
  980. + new_file_h->e_shnum += 1;
  981. +
  982. + #ifdef DEBUG
  983. +@@ -629,12 +856,22 @@ unexec (new_name, old_name, data_start,
  984. + for (n = new_file_h->e_phnum - 1; n >= 0; n--)
  985. + {
  986. + /* Compute maximum of all requirements for alignment of section. */
  987. +- int alignment = (NEW_PROGRAM_H (n)).p_align;
  988. ++ ElfW(Word) alignment = (NEW_PROGRAM_H (n)).p_align;
  989. if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment)
  990. alignment = OLD_SECTION_H (old_bss_index).sh_addralign;
  991.  
  992. -+#ifdef HAVE_MIPS_SBSS
  993. +- if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz > old_bss_addr)
  994. +- fatal ("Program segment above .bss in %s\n", old_name, 0);
  995. ++#ifdef __sgi
  996. ++ /* According to r02kar@x4u2.desy.de (Karsten Kuenne)
  997. ++ and oliva@gnu.org (Alexandre Oliva), on IRIX 5.2, we
  998. ++ always get "Program segment above .bss" when dumping
  999. ++ when the executable doesn't have an sbss section. */
  1000. ++ if (old_sbss_index != -1)
  1001. ++#endif /* __sgi */
  1002. + if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz
  1003. -+ > round_up (old_bss_addr, alignment))
  1004. -+ fatal ("Program segment above .bss in %s\n", old_name, 0);
  1005. -+#else /* not HAVE_MIPS_SBSS */
  1006. - if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz > old_bss_addr)
  1007. - fatal ("Program segment above .bss in %s\n", old_name, 0);
  1008. -+#endif /* not HAVE_MIPS_SBSS */
  1009. ++ > (old_sbss_index == -1
  1010. ++ ? old_bss_addr
  1011. ++ : round_up (old_bss_addr, alignment)))
  1012. ++ fatal ("Program segment above .bss in %s\n", old_name, 0);
  1013.  
  1014. if (NEW_PROGRAM_H (n).p_type == PT_LOAD
  1015. && (round_up ((NEW_PROGRAM_H (n)).p_vaddr
  1016. -@@ -646,9 +889,16 @@ unexec (new_name, old_name, data_start,
  1017. +@@ -646,10 +883,12 @@ unexec (new_name, old_name, data_start,
  1018. if (n < 0)
  1019. fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
  1020.  
  1021. - NEW_PROGRAM_H (n).p_filesz += new_data2_size;
  1022. -+#ifdef HAVE_MIPS_SBSS
  1023. -+ bss_phdr_index = n;
  1024. -+#endif
  1025. -+
  1026. + /* Make sure that the size includes any padding before the old .bss
  1027. + section. */
  1028. + NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr;
  1029. NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
  1030.  
  1031. -+
  1032. - #if 0 /* Maybe allow section after data2 - does this ever happen? */
  1033. +-#if 0 /* Maybe allow section after data2 - does this ever happen? */
  1034. ++#ifdef IRIX5 /* allow section after data2 */
  1035. for (n = new_file_h->e_phnum - 1; n >= 0; n--)
  1036. {
  1037. -@@ -675,18 +925,27 @@ unexec (new_name, old_name, data_start,
  1038. + if (NEW_PROGRAM_H (n).p_vaddr
  1039. +@@ -657,7 +896,7 @@ unexec (new_name, old_name, data_start,
  1040. + NEW_PROGRAM_H (n).p_vaddr += new_data2_size - old_bss_size;
  1041. +
  1042. + if (NEW_PROGRAM_H (n).p_offset >= new_data2_offset)
  1043. +- NEW_PROGRAM_H (n).p_offset += new_data2_size;
  1044. ++ NEW_PROGRAM_H (n).p_offset += new_data2_incr;
  1045. + }
  1046. + #endif
  1047. +
  1048. +@@ -675,18 +914,20 @@ unexec (new_name, old_name, data_start,
  1049. if (old_data_index == old_file_h->e_shnum)
  1050. fatal ("Can't find .data in %s.\n", old_name, 0);
  1051.  
  1052. @@ -837,17 +751,10 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1053. caddr_t src;
  1054. - /* If it is bss section, insert the new data2 section before it. */
  1055. - if (n == old_bss_index)
  1056. -+ int temp_index;
  1057. -+#ifdef HAVE_MIPS_SBSS
  1058. + /* If it is (s)bss section, insert the new data2 section before it. */
  1059. + /* new_data2_index is the index of either old_sbss or old_bss, that was
  1060. + chosen as a section for new_data2. */
  1061. -+ temp_index = new_data2_index;
  1062. -+#else /* not HAVE_MIPS_SBSS */
  1063. -+ /* If it is bss section, insert the new data2 section before it. */
  1064. -+ temp_index = old_bss_index;
  1065. -+#endif /* not HAVE_MIPS_SBSS */
  1066. -+ if (n == temp_index)
  1067. ++ if (n == new_data2_index)
  1068. {
  1069. /* Steal the data section header for this data2 section. */
  1070. memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (old_data_index),
  1071. @@ -857,7 +764,7 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1072. NEW_SECTION_H (nn).sh_addr = new_data2_addr;
  1073. NEW_SECTION_H (nn).sh_offset = new_data2_offset;
  1074. NEW_SECTION_H (nn).sh_size = new_data2_size;
  1075. -@@ -696,37 +955,87 @@ unexec (new_name, old_name, data_start,
  1076. +@@ -696,73 +937,235 @@ unexec (new_name, old_name, data_start,
  1077. NEW_SECTION_H (nn).sh_addralign = OLD_SECTION_H (n).sh_addralign;
  1078.  
  1079. /* Now copy over what we have in the memory now. */
  1080. @@ -873,49 +780,29 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1081. +
  1082. + memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n),
  1083. old_file_h->e_shentsize);
  1084. -
  1085. +-
  1086. - /* The new bss section's size is zero, and its file offset and virtual
  1087. - address should be off by NEW_DATA2_SIZE. */
  1088. - if (n == old_bss_index)
  1089. ++
  1090. + if (n == old_bss_index
  1091. -+#ifdef HAVE_MIPS_SBSS
  1092. + /* The new bss and sbss section's size is zero, and its file offset
  1093. + and virtual address should be off by NEW_DATA2_SIZE. */
  1094. + || n == old_sbss_index
  1095. -+#endif /* HAVE_MIPS_SBSS */
  1096. + )
  1097. {
  1098. - /* NN should be `old_bss_index + 1' at this point. */
  1099. - NEW_SECTION_H (nn).sh_offset += new_data2_size;
  1100. - NEW_SECTION_H (nn).sh_addr += new_data2_size;
  1101. +- /* NN should be `old_bss_index + 1' at this point. */
  1102. +- NEW_SECTION_H (nn).sh_offset += new_data2_size;
  1103. +- NEW_SECTION_H (nn).sh_addr += new_data2_size;
  1104. ++ /* NN should be `old_s?bss_index + 1' at this point. */
  1105. ++ NEW_SECTION_H (nn).sh_offset = new_data2_offset + new_data2_size;
  1106. ++ NEW_SECTION_H (nn).sh_addr = new_data2_addr + new_data2_size;
  1107. /* Let the new bss section address alignment be the same as the
  1108. - section address alignment followed the old bss section, so
  1109. + section address alignment followed the old bss section, so
  1110. this section will be placed in exactly the same place. */
  1111. NEW_SECTION_H (nn).sh_addralign = OLD_SECTION_H (nn).sh_addralign;
  1112. NEW_SECTION_H (nn).sh_size = 0;
  1113. -+
  1114. -+#ifdef HAVE_MIPS_SBSS
  1115. -+ /* On ELF mips, the new data section replaces both .sbss and .bss
  1116. -+ (we have, after all, written to them.). Adding new_data2_size
  1117. -+ to the sh_addr and sh_offset of sbss puts sbss at the end of
  1118. -+ the new data section. setting the size to zero makes it empty.
  1119. -+ But then, adding the new_data2_size to the bss address puts
  1120. -+ its start beyond the end of the original bss. If the sbss size
  1121. -+ was bigger than a page, the bss ends up not covered by the
  1122. -+ program header. This breaks strip. Since both sbss and bss
  1123. -+ are zero-sized, just use the same address and file offset for
  1124. -+ both, guaranteeing other tools will assign them to the same
  1125. -+ program section (asssuming no sections are loaded at higher
  1126. -+ offsets.) */
  1127. -+ if (n == old_bss_index) {
  1128. -+ int new_sbss_bss_padding = NEW_SECTION_H(nn).sh_addr -
  1129. -+ NEW_SECTION_H(nn - 1).sh_addr;
  1130. -+ printf("sbss to bss offset =0x%x\n", new_sbss_bss_padding);
  1131. -+ NEW_SECTION_H(nn).sh_addr =NEW_SECTION_H(nn - 1).sh_addr;
  1132. -+ NEW_SECTION_H(nn).sh_offset =NEW_SECTION_H(nn - 1).sh_offset;
  1133. -+ }
  1134. -+#endif /* HAVE_MIPS_SBSS */
  1135. }
  1136. - /* Any section that was original placed AFTER the bss section should now
  1137. - be off by NEW_DATA2_SIZE. */
  1138. @@ -925,7 +812,12 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1139. + else
  1140. + {
  1141. + /* Any section that was original placed AFTER the bss
  1142. -+ section should now be off by NEW_DATA2_SIZE. */
  1143. ++ section should now be off by NEW_DATA2_INCR. If a
  1144. ++ section overlaps the .bss section, consider it to be
  1145. ++ placed after the .bss section. Overlap can occur if the
  1146. ++ section just before .bss has less-strict alignment; this
  1147. ++ was observed between .symtab and .bss on Solaris 2.5.1
  1148. ++ (sparc) with GCC snapshot 960602. */
  1149. +#ifdef SOLARIS_POWERPC
  1150. + /* On PPC Reference Platform running Solaris 2.5.1
  1151. + the plt section is also of type NOBI like the bss section.
  1152. @@ -937,12 +829,10 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1153. + Erik Deumens, deumens@qtp.ufl.edu. */
  1154. + if (NEW_SECTION_H (nn).sh_offset
  1155. + >= OLD_SECTION_H (old_bss_index-1).sh_offset)
  1156. -+ NEW_SECTION_H (nn).sh_offset += new_data2_size;
  1157. ++ NEW_SECTION_H (nn).sh_offset += new_data2_incr;
  1158. +#else
  1159. -+ if (round_up (NEW_SECTION_H (nn).sh_offset,
  1160. -+ OLD_SECTION_H (old_bss_index).sh_addralign)
  1161. -+ >= new_data2_offset)
  1162. -+ NEW_SECTION_H (nn).sh_offset += new_data2_size;
  1163. ++ if (NEW_SECTION_H (nn).sh_offset >= old_bss_offset)
  1164. ++ NEW_SECTION_H (nn).sh_offset += new_data2_incr;
  1165. +#endif
  1166. + /* Any section that was originally placed after the section
  1167. + header table should now be off by the size of one section
  1168. @@ -960,7 +850,20 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1169. PATCH_INDEX (NEW_SECTION_H (nn).sh_link);
  1170. /* For symbol tables, info is a symbol table index,
  1171. so don't change it. */
  1172. -@@ -738,7 +1047,7 @@ unexec (new_name, old_name, data_start,
  1173. + if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB
  1174. + && NEW_SECTION_H (nn).sh_type != SHT_DYNSYM)
  1175. + PATCH_INDEX (NEW_SECTION_H (nn).sh_info);
  1176. ++
  1177. ++ if (old_sbss_index != -1)
  1178. ++ if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss"))
  1179. ++ {
  1180. ++ NEW_SECTION_H (nn).sh_offset =
  1181. ++ round_up (NEW_SECTION_H (nn).sh_offset,
  1182. ++ NEW_SECTION_H (nn).sh_addralign);
  1183. ++ NEW_SECTION_H (nn).sh_type = SHT_PROGBITS;
  1184. ++ }
  1185. +
  1186. + /* Now, start to copy the content of sections. */
  1187. if (NEW_SECTION_H (nn).sh_type == SHT_NULL
  1188. || NEW_SECTION_H (nn).sh_type == SHT_NOBITS)
  1189. continue;
  1190. @@ -969,20 +872,39 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1191. /* Write out the sections. .data and .data1 (and data2, called
  1192. ".data" in the strings table) get copied from the current process
  1193. instead of the old file. */
  1194. -@@ -747,22 +1056,54 @@ unexec (new_name, old_name, data_start,
  1195. - || !strcmp ((old_section_names + NEW_SECTION_H(n).sh_name),
  1196. - ".sdata")
  1197. - #endif
  1198. -+#ifdef HAVE_MIPS_SBSS
  1199. + if (!strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".data")
  1200. +-#ifdef _nec_ews_svr4 /* hir, 1994.6.13 */
  1201. +- || !strcmp ((old_section_names + NEW_SECTION_H(n).sh_name),
  1202. + || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
  1203. -+ ".sdata")
  1204. + ".sdata")
  1205. + || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
  1206. + ".lit4")
  1207. + || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
  1208. + ".lit8")
  1209. -+#endif /* HAVE_MIPS_SBSS */
  1210. ++ /* The conditional bit below was in Oliva's original code
  1211. ++ (1999-08-25) and seems to have been dropped by mistake
  1212. ++ subsequently. It prevents a crash at startup under X in
  1213. ++ `IRIX64 6.5 6.5.17m' with c_dev 7.3.1.3m. It causes no
  1214. ++ trouble on the other ELF platforms I could test (Irix
  1215. ++ 6.5.15m, Solaris 8, Debian Potato x86, Debian Woody
  1216. ++ SPARC); however, it's reported to cause crashes under
  1217. ++ some version of GNU/Linux. It's not yet clear what's
  1218. ++ changed in that Irix version to cause the problem, or why
  1219. ++ the fix sometimes fails under GNU/Linux. There's
  1220. ++ probably no good reason to have something Irix-specific
  1221. ++ here, but this will have to do for now. IRIX6_5 is the
  1222. ++ most specific macro we have to test. -- fx 2002-10-01 */
  1223. ++#ifdef IRIX6_5
  1224. ++ || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
  1225. ++ ".got")
  1226. + #endif
  1227. || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
  1228. - ".data1"))
  1229. +- ".data1"))
  1230. ++ ".sdata1")
  1231. ++ || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
  1232. ++ ".data1")
  1233. ++ || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
  1234. ++ ".sbss"))
  1235. src = (caddr_t) OLD_SECTION_H (n).sh_addr;
  1236. else
  1237. src = old_base + OLD_SECTION_H (n).sh_offset;
  1238. @@ -991,18 +913,30 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1239. memcpy (NEW_SECTION_H (nn).sh_offset + new_base, src,
  1240. NEW_SECTION_H (nn).sh_size);
  1241.  
  1242. -+#ifdef __alpha__
  1243. ++#if defined(__alpha__) && !defined(__NetBSD__)
  1244. + /* Update Alpha COFF symbol table: */
  1245. + if (strcmp (old_section_names + OLD_SECTION_H (n).sh_name, ".mdebug")
  1246. + == 0)
  1247. + {
  1248. + pHDRR symhdr = (pHDRR) (NEW_SECTION_H (nn).sh_offset + new_base);
  1249. -+ relocate_ecoff_symhdr(symhdr, new_data2_size);
  1250. ++
  1251. ++ symhdr->cbLineOffset += new_data2_size;
  1252. ++ symhdr->cbDnOffset += new_data2_size;
  1253. ++ symhdr->cbPdOffset += new_data2_size;
  1254. ++ symhdr->cbSymOffset += new_data2_size;
  1255. ++ symhdr->cbOptOffset += new_data2_size;
  1256. ++ symhdr->cbAuxOffset += new_data2_size;
  1257. ++ symhdr->cbSsOffset += new_data2_size;
  1258. ++ symhdr->cbSsExtOffset += new_data2_size;
  1259. ++ symhdr->cbFdOffset += new_data2_size;
  1260. ++ symhdr->cbRfdOffset += new_data2_size;
  1261. ++ symhdr->cbExtOffset += new_data2_size;
  1262. + }
  1263. +#endif /* __alpha__ */
  1264. +
  1265. +#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
  1266. -+ if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG && old_mdebug_index)
  1267. ++ if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
  1268. ++ && old_mdebug_index != -1)
  1269. + {
  1270. + int diff = NEW_SECTION_H(nn).sh_offset
  1271. + - OLD_SECTION_H(old_mdebug_index).sh_offset;
  1272. @@ -1010,10 +944,75 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1273. +
  1274. + if (diff)
  1275. + {
  1276. -+ relocate_ecoff_symhdr(phdr, diff);
  1277. ++ phdr->cbLineOffset += diff;
  1278. ++ phdr->cbDnOffset += diff;
  1279. ++ phdr->cbPdOffset += diff;
  1280. ++ phdr->cbSymOffset += diff;
  1281. ++ phdr->cbOptOffset += diff;
  1282. ++ phdr->cbAuxOffset += diff;
  1283. ++ phdr->cbSsOffset += diff;
  1284. ++ phdr->cbSsExtOffset += diff;
  1285. ++ phdr->cbFdOffset += diff;
  1286. ++ phdr->cbRfdOffset += diff;
  1287. ++ phdr->cbExtOffset += diff;
  1288. + }
  1289. + }
  1290. -+#endif /* __sony_news and systype_sysv */
  1291. ++#endif /* __sony_news && _SYSTYPE_SYSV */
  1292. ++
  1293. ++#if __sgi
  1294. ++ /* Adjust the HDRR offsets in .mdebug and copy the
  1295. ++ line data if it's in its usual 'hole' in the object.
  1296. ++ Makes the new file debuggable with dbx.
  1297. ++ patches up two problems: the absolute file offsets
  1298. ++ in the HDRR record of .mdebug (see /usr/include/syms.h), and
  1299. ++ the ld bug that gets the line table in a hole in the
  1300. ++ elf file rather than in the .mdebug section proper.
  1301. ++ David Anderson. davea@sgi.com Jan 16,1994. */
  1302. ++ if (n == old_mdebug_index)
  1303. ++ {
  1304. ++#define MDEBUGADJUST(__ct,__fileaddr) \
  1305. ++ if (n_phdrr->__ct > 0) \
  1306. ++ { \
  1307. ++ n_phdrr->__fileaddr += movement; \
  1308. ++ }
  1309. ++
  1310. ++ HDRR * o_phdrr = (HDRR *)((byte *)old_base + OLD_SECTION_H (n).sh_offset);
  1311. ++ HDRR * n_phdrr = (HDRR *)((byte *)new_base + NEW_SECTION_H (nn).sh_offset);
  1312. ++ unsigned movement = new_data2_size;
  1313. ++
  1314. ++ MDEBUGADJUST (idnMax, cbDnOffset);
  1315. ++ MDEBUGADJUST (ipdMax, cbPdOffset);
  1316. ++ MDEBUGADJUST (isymMax, cbSymOffset);
  1317. ++ MDEBUGADJUST (ioptMax, cbOptOffset);
  1318. ++ MDEBUGADJUST (iauxMax, cbAuxOffset);
  1319. ++ MDEBUGADJUST (issMax, cbSsOffset);
  1320. ++ MDEBUGADJUST (issExtMax, cbSsExtOffset);
  1321. ++ MDEBUGADJUST (ifdMax, cbFdOffset);
  1322. ++ MDEBUGADJUST (crfd, cbRfdOffset);
  1323. ++ MDEBUGADJUST (iextMax, cbExtOffset);
  1324. ++ /* The Line Section, being possible off in a hole of the object,
  1325. ++ requires special handling. */
  1326. ++ if (n_phdrr->cbLine > 0)
  1327. ++ {
  1328. ++ if (o_phdrr->cbLineOffset > (OLD_SECTION_H (n).sh_offset
  1329. ++ + OLD_SECTION_H (n).sh_size))
  1330. ++ {
  1331. ++ /* line data is in a hole in elf. do special copy and adjust
  1332. ++ for this ld mistake.
  1333. ++ */
  1334. ++ n_phdrr->cbLineOffset += movement;
  1335. ++
  1336. ++ memcpy (n_phdrr->cbLineOffset + new_base,
  1337. ++ o_phdrr->cbLineOffset + old_base, n_phdrr->cbLine);
  1338. ++ }
  1339. ++ else
  1340. ++ {
  1341. ++ /* somehow line data is in .mdebug as it is supposed to be. */
  1342. ++ MDEBUGADJUST (cbLine, cbLineOffset);
  1343. ++ }
  1344. ++ }
  1345. ++ }
  1346. ++#endif /* __sgi */
  1347. +
  1348. /* If it is the symbol table, its st_shndx field needs to be patched. */
  1349. if (NEW_SECTION_H (nn).sh_type == SHT_SYMTAB
  1350. @@ -1027,7 +1026,7 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1351. new_base);
  1352. for (; num--; sym++)
  1353. {
  1354. -@@ -770,7 +1111,7 @@ unexec (new_name, old_name, data_start,
  1355. +@@ -770,7 +1173,7 @@ unexec (new_name, old_name, data_start,
  1356. || (sym->st_shndx == SHN_ABS)
  1357. || (sym->st_shndx == SHN_COMMON))
  1358. continue;
  1359. @@ -1036,7 +1035,7 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1360. PATCH_INDEX (sym->st_shndx);
  1361. }
  1362. }
  1363. -@@ -780,22 +1121,72 @@ unexec (new_name, old_name, data_start,
  1364. +@@ -780,30 +1183,101 @@ unexec (new_name, old_name, data_start,
  1365. for (n = new_file_h->e_shnum - 1; n; n--)
  1366. {
  1367. byte *symnames;
  1368. @@ -1064,6 +1063,7 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1369. memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
  1370. }
  1371.  
  1372. +- /* Close the files and make the new file executable. */
  1373. + /* This loop seeks out relocation sections for the data section, so
  1374. + that it can undo relocations performed by the runtime linker. */
  1375. + for (n = new_file_h->e_shnum - 1; n; n--)
  1376. @@ -1080,6 +1080,18 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1377. + nn = section.sh_info;
  1378. + if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
  1379. + || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
  1380. ++ ".sdata")
  1381. ++ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
  1382. ++ ".lit4")
  1383. ++ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
  1384. ++ ".lit8")
  1385. ++#ifdef IRIX6_5 /* see above */
  1386. ++ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
  1387. ++ ".got")
  1388. ++#endif
  1389. ++ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
  1390. ++ ".sdata1")
  1391. ++ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
  1392. + ".data1"))
  1393. + {
  1394. + ElfW(Addr) offset = NEW_SECTION_H (nn).sh_addr -
  1395. @@ -1102,15 +1114,34 @@ $NetBSD: patch-ab,v 1.3 2011/12/24 17:07
  1396. + break;
  1397. + }
  1398. + }
  1399. -+
  1400. -+#ifdef UNEXEC_USE_MAP_PRIVATE
  1401. -+ if (lseek (new_file, 0, SEEK_SET) == -1)
  1402. -+ fatal ("Can't rewind (%s): errno %d\n", new_name, errno);
  1403. +
  1404. +- if (close (old_file))
  1405. +- fatal ("Can't close (%s): errno %d\n", old_name, errno);
  1406. ++ /* Write out new_file, close it, and free the buffer containing its
  1407. ++ * contents */
  1408. +
  1409. + if (write (new_file, new_base, new_file_size) != new_file_size)
  1410. -+ fatal ("Can't write (%s): errno %d\n", new_name, errno);
  1411. ++ fatal ("Didn't write %d bytes to %s: errno %d\n",
  1412. ++ new_file_size, new_base, errno);
  1413. +
  1414. + if (close (new_file))
  1415. + fatal ("Can't close (%s): errno %d\n", new_name, errno);
  1416. +
  1417. ++ munmap (new_base, new_file_size);
  1418. ++
  1419. ++ /* Close old_file, and free the corresponding buffer */
  1420. ++
  1421. ++#if MAP_ANON == 0
  1422. ++ close (mmap_fd);
  1423. +#endif
  1424. +
  1425. - /* Close the files and make the new file executable. */
  1426. ++ if (close (old_file))
  1427. ++ fatal ("Can't close (%s): errno %d\n", old_name, errno);
  1428. ++
  1429. ++ munmap (old_base, old_file_size);
  1430. ++
  1431. ++ /* Make the new file executable */
  1432. ++
  1433. + if (stat (new_name, &stat_buf) == -1)
  1434. + fatal ("Can't stat (%s): errno %d\n", new_name, errno);
  1435.  
  1436. - if (close (old_file))
  1437. Index: patches/patch-src_alloc_c
  1438. ===================================================================
  1439. RCS file: /cvsroot/pkgsrc/editors/mule/patches/patch-src_alloc_c,v
  1440. retrieving revision 1.2
  1441. diff -u -p -d -r1.2 patch-src_alloc_c
  1442. --- patches/patch-src_alloc_c 24 Dec 2011 17:07:07 -0000 1.2
  1443. +++ patches/patch-src_alloc_c 27 Apr 2017 16:07:10 -0000
  1444. @@ -1,9 +1,6 @@
  1445. $NetBSD: patch-src_alloc_c,v 1.2 2011/12/24 17:07:07 dholland Exp $
  1446.  
  1447. - use standard includes
  1448. -- add an empty asm() destroying memory that prevents gcc from
  1449. - optimizing out __malloc_hook and friends (which leads to
  1450. - SIGSEGV in temacs during build)
  1451.  
  1452. --- src/alloc.c.orig 1994-10-24 11:37:41.000000000 +0000
  1453. +++ src/alloc.c
  1454. @@ -15,33 +12,3 @@ $NetBSD: patch-src_alloc_c,v 1.2 2011/12
  1455.  
  1456. #include <config.h>
  1457. #include "lisp.h"
  1458. -@@ -240,6 +241,9 @@ emacs_blocked_free (ptr)
  1459. - {
  1460. - BLOCK_INPUT;
  1461. - __free_hook = old_free_hook;
  1462. -+#ifdef __GNUC__
  1463. -+ __asm __volatile("":::"memory");
  1464. -+#endif
  1465. - free (ptr);
  1466. - __free_hook = emacs_blocked_free;
  1467. - UNBLOCK_INPUT;
  1468. -@@ -253,6 +257,9 @@ emacs_blocked_malloc (size)
  1469. -
  1470. - BLOCK_INPUT;
  1471. - __malloc_hook = old_malloc_hook;
  1472. -+#ifdef __GNUC__
  1473. -+ __asm __volatile("":::"memory");
  1474. -+#endif
  1475. - value = (void *) malloc (size);
  1476. - __malloc_hook = emacs_blocked_malloc;
  1477. - UNBLOCK_INPUT;
  1478. -@@ -269,6 +276,9 @@ emacs_blocked_realloc (ptr, size)
  1479. -
  1480. - BLOCK_INPUT;
  1481. - __realloc_hook = old_realloc_hook;
  1482. -+#ifdef __GNUC__
  1483. -+ __asm __volatile("":::"memory");
  1484. -+#endif
  1485. - value = (void *) realloc (ptr, size);
  1486. - __realloc_hook = emacs_blocked_realloc;
  1487. - UNBLOCK_INPUT;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!