-/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001
- Free Software Foundation, Inc.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
In other words, you are welcome to use, share and improve this program.
You are forbidden to forbid anyone else to use, share and improve
temacs:
**** SECTION HEADER TABLE ****
-[No] Type Flags Addr Offset Size Name
- Link Info Adralgn Entsize
+ [No] Type Flags Addr Offset Size Name
+ Link Info Adralgn Entsize
-[1] 1 2 0x80480d4 0xd4 0x13 .interp
- 0 0 0x1 0
+ [1] 1 2 0x80480d4 0xd4 0x13 .interp
+ 0 0 0x1 0
-[2] 5 2 0x80480e8 0xe8 0x388 .hash
- 3 0 0x4 0x4
+ [2] 5 2 0x80480e8 0xe8 0x388 .hash
+ 3 0 0x4 0x4
-[3] 11 2 0x8048470 0x470 0x7f0 .dynsym
- 4 1 0x4 0x10
+ [3] 11 2 0x8048470 0x470 0x7f0 .dynsym
+ 4 1 0x4 0x10
-[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
- 0 0 0x1 0
+ [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
+ 0 0 0x1 0
-[5] 9 2 0x8049010 0x1010 0x338 .rel.plt
- 3 7 0x4 0x8
+ [5] 9 2 0x8049010 0x1010 0x338 .rel.plt
+ 3 7 0x4 0x8
-[6] 1 6 0x8049348 0x1348 0x3 .init
- 0 0 0x4 0
+ [6] 1 6 0x8049348 0x1348 0x3 .init
+ 0 0 0x4 0
-[7] 1 6 0x804934c 0x134c 0x680 .plt
- 0 0 0x4 0x4
+ [7] 1 6 0x804934c 0x134c 0x680 .plt
+ 0 0 0x4 0x4
-[8] 1 6 0x80499cc 0x19cc 0x3c56f .text
- 0 0 0x4 0
+ [8] 1 6 0x80499cc 0x19cc 0x3c56f .text
+ 0 0 0x4 0
-[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
- 0 0 0x4 0
+ [9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
+ 0 0 0x4 0
-[10] 1 2 0x8085f40 0x3df40 0x69c .rodata
- 0 0 0x4 0
+ [10] 1 2 0x8085f40 0x3df40 0x69c .rodata
+ 0 0 0x4 0
-[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
- 0 0 0x4 0
+ [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
+ 0 0 0x4 0
-[12] 1 3 0x8088330 0x3f330 0x20afc .data
- 0 0 0x4 0
+ [12] 1 3 0x8088330 0x3f330 0x20afc .data
+ 0 0 0x4 0
-[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
- 0 0 0x4 0
+ [13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
+ 0 0 0x4 0
-[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
- 0 0 0x4 0x4
+ [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
+ 0 0 0x4 0x4
-[15] 6 3 0x80a9874 0x60874 0x80 .dynamic
- 4 0 0x4 0x8
+ [15] 6 3 0x80a9874 0x60874 0x80 .dynamic
+ 4 0 0x4 0x8
-[16] 8 3 0x80a98f4 0x608f4 0x449c .bss
- 0 0 0x4 0
+ [16] 8 3 0x80a98f4 0x608f4 0x449c .bss
+ 0 0 0x4 0
-[17] 2 0 0 0x608f4 0x9b90 .symtab
- 18 371 0x4 0x10
+ [17] 2 0 0 0x608f4 0x9b90 .symtab
+ 18 371 0x4 0x10
-[18] 3 0 0 0x6a484 0x8526 .strtab
- 0 0 0x1 0
+ [18] 3 0 0 0x6a484 0x8526 .strtab
+ 0 0 0x1 0
-[19] 3 0 0 0x729aa 0x93 .shstrtab
- 0 0 0x1 0
+ [19] 3 0 0 0x729aa 0x93 .shstrtab
+ 0 0 0x1 0
-[20] 1 0 0 0x72a3d 0x68b7 .comment
- 0 0 0x1 0
+ [20] 1 0 0 0x72a3d 0x68b7 .comment
+ 0 0 0x1 0
-raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
-xemacs:
+ xemacs:
- **** SECTION HEADER TABLE ****
-[No] Type Flags Addr Offset Size Name
- Link Info Adralgn Entsize
+ **** SECTION HEADER TABLE ****
+ [No] Type Flags Addr Offset Size Name
+ Link Info Adralgn Entsize
-[1] 1 2 0x80480d4 0xd4 0x13 .interp
- 0 0 0x1 0
+ [1] 1 2 0x80480d4 0xd4 0x13 .interp
+ 0 0 0x1 0
-[2] 5 2 0x80480e8 0xe8 0x388 .hash
- 3 0 0x4 0x4
+ [2] 5 2 0x80480e8 0xe8 0x388 .hash
+ 3 0 0x4 0x4
-[3] 11 2 0x8048470 0x470 0x7f0 .dynsym
- 4 1 0x4 0x10
+ [3] 11 2 0x8048470 0x470 0x7f0 .dynsym
+ 4 1 0x4 0x10
-[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
- 0 0 0x1 0
+ [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
+ 0 0 0x1 0
-[5] 9 2 0x8049010 0x1010 0x338 .rel.plt
- 3 7 0x4 0x8
+ [5] 9 2 0x8049010 0x1010 0x338 .rel.plt
+ 3 7 0x4 0x8
-[6] 1 6 0x8049348 0x1348 0x3 .init
- 0 0 0x4 0
+ [6] 1 6 0x8049348 0x1348 0x3 .init
+ 0 0 0x4 0
-[7] 1 6 0x804934c 0x134c 0x680 .plt
- 0 0 0x4 0x4
+ [7] 1 6 0x804934c 0x134c 0x680 .plt
+ 0 0 0x4 0x4
-[8] 1 6 0x80499cc 0x19cc 0x3c56f .text
- 0 0 0x4 0
+ [8] 1 6 0x80499cc 0x19cc 0x3c56f .text
+ 0 0 0x4 0
-[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
- 0 0 0x4 0
+ [9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
+ 0 0 0x4 0
-[10] 1 2 0x8085f40 0x3df40 0x69c .rodata
- 0 0 0x4 0
+ [10] 1 2 0x8085f40 0x3df40 0x69c .rodata
+ 0 0 0x4 0
-[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
- 0 0 0x4 0
+ [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
+ 0 0 0x4 0
-[12] 1 3 0x8088330 0x3f330 0x20afc .data
- 0 0 0x4 0
+ [12] 1 3 0x8088330 0x3f330 0x20afc .data
+ 0 0 0x4 0
-[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
- 0 0 0x4 0
+ [13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
+ 0 0 0x4 0
-[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
- 0 0 0x4 0x4
+ [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
+ 0 0 0x4 0x4
-[15] 6 3 0x80a9874 0x60874 0x80 .dynamic
- 4 0 0x4 0x8
+ [15] 6 3 0x80a9874 0x60874 0x80 .dynamic
+ 4 0 0x4 0x8
-[16] 8 3 0x80c6800 0x7d800 0 .bss
- 0 0 0x4 0
+ [16] 8 3 0x80c6800 0x7d800 0 .bss
+ 0 0 0x4 0
-[17] 2 0 0 0x7d800 0x9b90 .symtab
- 18 371 0x4 0x10
+ [17] 2 0 0 0x7d800 0x9b90 .symtab
+ 18 371 0x4 0x10
-[18] 3 0 0 0x87390 0x8526 .strtab
- 0 0 0x1 0
+ [18] 3 0 0 0x87390 0x8526 .strtab
+ 0 0 0x1 0
-[19] 3 0 0 0x8f8b6 0x93 .shstrtab
- 0 0 0x1 0
+ [19] 3 0 0 0x8f8b6 0x93 .shstrtab
+ 0 0 0x1 0
-[20] 1 0 0 0x8f949 0x68b7 .comment
- 0 0 0x1 0
+ [20] 1 0 0 0x8f949 0x68b7 .comment
+ 0 0 0x1 0
-[21] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
- 0 0 0x4 0
+ [21] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
+ 0 0 0x4 0
- * This is an example of how the file header is changed. "Shoff" is
- * the section header offset within the file. Since that table is
- * after the new .data section, it is moved. "Shnum" is the number of
- * sections, which we increment.
- *
- * "Phoff" is the file offset to the program header. "Phentsize" and
- * "Shentsz" are the program and section header entries sizes respectively.
- * These can be larger than the apparent struct sizes.
+ * This is an example of how the file header is changed. "Shoff" is
+ * the section header offset within the file. Since that table is
+ * after the new .data section, it is moved. "Shnum" is the number of
+ * sections, which we increment.
+ *
+ * "Phoff" is the file offset to the program header. "Phentsize" and
+ * "Shentsz" are the program and section header entries sizes respectively.
+ * These can be larger than the apparent struct sizes.
-raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
-temacs:
+ temacs:
- **** ELF HEADER ****
-Class Data Type Machine Version
-Entry Phoff Shoff Flags Ehsize
-Phentsize Phnum Shentsz Shnum Shstrndx
+ **** ELF HEADER ****
+ Class Data Type Machine Version
+ Entry Phoff Shoff Flags Ehsize
+ Phentsize Phnum Shentsz Shnum Shstrndx
-1 1 2 3 1
-0x80499cc 0x34 0x792f4 0 0x34
-0x20 5 0x28 21 19
+ 1 1 2 3 1
+ 0x80499cc 0x34 0x792f4 0 0x34
+ 0x20 5 0x28 21 19
-raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
-xemacs:
+ xemacs:
- **** ELF HEADER ****
-Class Data Type Machine Version
-Entry Phoff Shoff Flags Ehsize
-Phentsize Phnum Shentsz Shnum Shstrndx
+ **** ELF HEADER ****
+ Class Data Type Machine Version
+ Entry Phoff Shoff Flags Ehsize
+ Phentsize Phnum Shentsz Shnum Shstrndx
-1 1 2 3 1
-0x80499cc 0x34 0x96200 0 0x34
-0x20 5 0x28 22 19
+ 1 1 2 3 1
+ 0x80499cc 0x34 0x96200 0 0x34
+ 0x20 5 0x28 22 19
- * These are the program headers. "Offset" is the file offset to the
- * segment. "Vaddr" is the memory load address. "Filesz" is the
- * segment size as it appears in the file, and "Memsz" is the size in
- * memory. Below, the third segment is the code and the fourth is the
- * data: the difference between Filesz and Memsz is .bss
+ * These are the program headers. "Offset" is the file offset to the
+ * segment. "Vaddr" is the memory load address. "Filesz" is the
+ * segment size as it appears in the file, and "Memsz" is the size in
+ * memory. Below, the third segment is the code and the fourth is the
+ * data: the difference between Filesz and Memsz is .bss
-raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
-temacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type Offset Vaddr Paddr
-Filesz Memsz Flags Align
+ temacs:
+ ***** PROGRAM EXECUTION HEADER *****
+ Type Offset Vaddr Paddr
+ Filesz Memsz Flags Align
-6 0x34 0x8048034 0
-0xa0 0xa0 5 0
+ 6 0x34 0x8048034 0
+ 0xa0 0xa0 5 0
-3 0xd4 0 0
-0x13 0 4 0
+ 3 0xd4 0 0
+ 0x13 0 4 0
-1 0x34 0x8048034 0
-0x3f2f9 0x3f2f9 5 0x1000
+ 1 0x34 0x8048034 0
+ 0x3f2f9 0x3f2f9 5 0x1000
-1 0x3f330 0x8088330 0
-0x215c4 0x25a60 7 0x1000
+ 1 0x3f330 0x8088330 0
+ 0x215c4 0x25a60 7 0x1000
-2 0x60874 0x80a9874 0
-0x80 0 7 0
+ 2 0x60874 0x80a9874 0
+ 0x80 0 7 0
-raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
-xemacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type Offset Vaddr Paddr
-Filesz Memsz Flags Align
+ xemacs:
+ ***** PROGRAM EXECUTION HEADER *****
+ Type Offset Vaddr Paddr
+ Filesz Memsz Flags Align
-6 0x34 0x8048034 0
-0xa0 0xa0 5 0
+ 6 0x34 0x8048034 0
+ 0xa0 0xa0 5 0
-3 0xd4 0 0
-0x13 0 4 0
+ 3 0xd4 0 0
+ 0x13 0 4 0
-1 0x34 0x8048034 0
-0x3f2f9 0x3f2f9 5 0x1000
+ 1 0x34 0x8048034 0
+ 0x3f2f9 0x3f2f9 5 0x1000
-1 0x3f330 0x8088330 0
-0x3e4d0 0x3e4d0 7 0x1000
+ 1 0x3f330 0x8088330 0
+ 0x3e4d0 0x3e4d0 7 0x1000
-2 0x60874 0x80a9874 0
-0x80 0 7 0
+ 2 0x60874 0x80a9874 0
+ 0x80 0 7 0
*/
* The above example now should look like:
**** SECTION HEADER TABLE ****
-[No] Type Flags Addr Offset Size Name
- Link Info Adralgn Entsize
+ [No] Type Flags Addr Offset Size Name
+ Link Info Adralgn Entsize
-[1] 1 2 0x80480d4 0xd4 0x13 .interp
- 0 0 0x1 0
+ [1] 1 2 0x80480d4 0xd4 0x13 .interp
+ 0 0 0x1 0
-[2] 5 2 0x80480e8 0xe8 0x388 .hash
- 3 0 0x4 0x4
+ [2] 5 2 0x80480e8 0xe8 0x388 .hash
+ 3 0 0x4 0x4
-[3] 11 2 0x8048470 0x470 0x7f0 .dynsym
- 4 1 0x4 0x10
+ [3] 11 2 0x8048470 0x470 0x7f0 .dynsym
+ 4 1 0x4 0x10
-[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
- 0 0 0x1 0
+ [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
+ 0 0 0x1 0
-[5] 9 2 0x8049010 0x1010 0x338 .rel.plt
- 3 7 0x4 0x8
+ [5] 9 2 0x8049010 0x1010 0x338 .rel.plt
+ 3 7 0x4 0x8
-[6] 1 6 0x8049348 0x1348 0x3 .init
- 0 0 0x4 0
+ [6] 1 6 0x8049348 0x1348 0x3 .init
+ 0 0 0x4 0
-[7] 1 6 0x804934c 0x134c 0x680 .plt
- 0 0 0x4 0x4
+ [7] 1 6 0x804934c 0x134c 0x680 .plt
+ 0 0 0x4 0x4
-[8] 1 6 0x80499cc 0x19cc 0x3c56f .text
- 0 0 0x4 0
+ [8] 1 6 0x80499cc 0x19cc 0x3c56f .text
+ 0 0 0x4 0
-[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
- 0 0 0x4 0
+ [9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
+ 0 0 0x4 0
-[10] 1 2 0x8085f40 0x3df40 0x69c .rodata
- 0 0 0x4 0
+ [10] 1 2 0x8085f40 0x3df40 0x69c .rodata
+ 0 0 0x4 0
-[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
- 0 0 0x4 0
+ [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
+ 0 0 0x4 0
-[12] 1 3 0x8088330 0x3f330 0x20afc .data
- 0 0 0x4 0
+ [12] 1 3 0x8088330 0x3f330 0x20afc .data
+ 0 0 0x4 0
-[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
- 0 0 0x4 0
+ [13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
+ 0 0 0x4 0
-[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
- 0 0 0x4 0x4
+ [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
+ 0 0 0x4 0x4
-[15] 6 3 0x80a9874 0x60874 0x80 .dynamic
- 4 0 0x4 0x8
+ [15] 6 3 0x80a9874 0x60874 0x80 .dynamic
+ 4 0 0x4 0x8
-[16] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
- 0 0 0x4 0
+ [16] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
+ 0 0 0x4 0
-[17] 8 3 0x80c6800 0x7d800 0 .bss
- 0 0 0x4 0
+ [17] 8 3 0x80c6800 0x7d800 0 .bss
+ 0 0 0x4 0
-[18] 2 0 0 0x7d800 0x9b90 .symtab
- 19 371 0x4 0x10
+ [18] 2 0 0 0x7d800 0x9b90 .symtab
+ 19 371 0x4 0x10
-[19] 3 0 0 0x87390 0x8526 .strtab
- 0 0 0x1 0
+ [19] 3 0 0 0x87390 0x8526 .strtab
+ 0 0 0x1 0
-[20] 3 0 0 0x8f8b6 0x93 .shstrtab
- 0 0 0x1 0
+ [20] 3 0 0 0x8f8b6 0x93 .shstrtab
+ 0 0 0x1 0
-[21] 1 0 0 0x8f949 0x68b7 .comment
- 0 0 0x1 0
+ [21] 1 0 0 0x8f949 0x68b7 .comment
+ 0 0 0x1 0
*/
\f
#include <string.h>
#else
#include <config.h>
-extern void fatal (char *, ...);
+extern void fatal (const char *msgid, ...);
#endif
#include <sys/types.h>
#if __sgi
#include <syms.h> /* for HDRR declaration */
#endif /* __sgi */
+#ifdef BROKEN_NOCOMBRELOC
+#include <assert.h>
+#endif
#ifndef MAP_ANON
#ifdef MAP_ANONYMOUS
long cbFdOffset;
long cbRfdOffset;
long cbExtOffset;
-} HDRR, *pHDRR;
+} HDRR, *pHDRR;
#define cbHDRR sizeof(HDRR)
#define hdrNil ((pHDRR)0)
#endif
ElfW(Addr) new_data2_addr;
int n, nn;
- int old_bss_index, old_sbss_index;
+ int old_bss_index, old_sbss_index, old_plt_index;
int old_data_index, new_data2_index;
int old_mdebug_index;
struct stat stat_buf;
int old_file_size;
+#ifdef BROKEN_NOCOMBRELOC
+ int unreloc_sections[10], n_unreloc_sections;
+#endif
/* Open the old file, allocate a buffer of the right size, and read
in the file contents. */
#if MAP_ANON == 0
mmap_fd = open ("/dev/zero", O_RDONLY);
if (mmap_fd < 0)
- fatal ("Can't open /dev/zero for reading: errno %d\n", errno);
+ fatal ("Can't open /dev/zero for reading: errno %d\n", errno, 0);
#endif
/* We cannot use malloc here because that may use sbrk. If it does,
old_base = mmap (NULL, old_file_size, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, mmap_fd, 0);
if (old_base == MAP_FAILED)
- fatal ("Can't allocate buffer for %s\n", old_name);
+ fatal ("Can't allocate buffer for %s\n", old_name, 0);
if (read (old_file, old_base, stat_buf.st_size) != stat_buf.st_size)
fatal ("Didn't read all of %s: errno %d\n", old_name, errno);
old_sbss_index = find_section (".sbss", old_section_names,
old_name, old_file_h, old_section_h, 1);
if (old_sbss_index != -1)
- if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
+ if (OLD_SECTION_H (old_sbss_index).sh_type != SHT_NOBITS)
old_sbss_index = -1;
- if (old_sbss_index == -1)
+ /* PowerPC64 has .plt in the BSS section. */
+ old_plt_index = find_section (".plt", old_section_names,
+ old_name, old_file_h, old_section_h, 1);
+ if (old_plt_index != -1)
+ if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+ old_plt_index = -1;
+
+ if (old_sbss_index == -1 && old_plt_index == -1)
{
old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
new_data2_index = old_bss_index;
}
+ else if (old_plt_index != -1
+ && (old_sbss_index == -1
+ || (OLD_SECTION_H (old_sbss_index).sh_addr
+ > OLD_SECTION_H (old_plt_index).sh_addr)))
+ {
+ old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+ old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+ + OLD_SECTION_H (old_plt_index).sh_size;
+ if (old_sbss_index != -1)
+ old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+ new_data2_index = old_plt_index;
+ }
else
{
old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
new_base = mmap (NULL, new_file_size, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, mmap_fd, 0);
if (new_base == MAP_FAILED)
- fatal ("Can't allocate buffer for %s\n", old_name);
+ fatal ("Can't allocate buffer for %s\n", old_name, 0);
new_file_h = (ElfW(Ehdr) *) new_base;
new_program_h = (ElfW(Phdr) *) ((byte *) new_base + old_file_h->e_phoff);
memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n),
old_file_h->e_shentsize);
-
+
if (n == old_bss_index
/* The new bss and sbss section's size is zero, and its file offset
and virtual address should be off by NEW_DATA2_SIZE. */
- || n == old_sbss_index
+ || n == old_sbss_index || n == old_plt_index
)
{
/* NN should be `old_s?bss_index + 1' at this point. */
}
else
{
- /* Any section that was original placed AFTER the bss
- section should now be off by NEW_DATA2_SIZE. */
+ /* Any section that was originally placed after the .bss
+ section should now be off by NEW_DATA2_SIZE. If a
+ section overlaps the .bss section, consider it to be
+ placed after the .bss section. Overlap can occur if the
+ section just before .bss has less-strict alignment; this
+ was observed between .symtab and .bss on Solaris 2.5.1
+ (sparc) with GCC snapshot 960602. */
#ifdef SOLARIS_POWERPC
/* On PPC Reference Platform running Solaris 2.5.1
the plt section is also of type NOBI like the bss section.
>= OLD_SECTION_H (old_bss_index-1).sh_offset)
NEW_SECTION_H (nn).sh_offset += new_data2_size;
#else
- if (round_up (NEW_SECTION_H (nn).sh_offset,
- OLD_SECTION_H (old_bss_index).sh_addralign)
- >= new_data2_offset)
+ if (NEW_SECTION_H (nn).sh_offset + NEW_SECTION_H (nn).sh_size
+ > new_data2_offset)
NEW_SECTION_H (nn).sh_offset += new_data2_size;
#endif
/* Any section that was originally placed after the section
if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB
&& NEW_SECTION_H (nn).sh_type != SHT_DYNSYM)
PATCH_INDEX (NEW_SECTION_H (nn).sh_info);
-
+
if (old_sbss_index != -1)
if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss"))
{
- NEW_SECTION_H (nn).sh_offset =
+ NEW_SECTION_H (nn).sh_offset =
round_up (NEW_SECTION_H (nn).sh_offset,
NEW_SECTION_H (nn).sh_addralign);
NEW_SECTION_H (nn).sh_type = SHT_PROGBITS;
".lit4")
|| !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
".lit8")
-#if __sgi
- /* According to David Kaelbling <drk@bobo.hudson.sgi.com>,
- the SGI-specific section below is required to avoid core
- dumps during startup (due to SIGBUS) in an X-toolkit
- version of Emacs . That was on Irix 6.5.14f with
- development tools versions 7.3.1.3m and 7.2.1.3m. */
+ /* The conditional bit below was in Oliva's original code
+ (1999-08-25) and seems to have been dropped by mistake
+ subsequently. It prevents a crash at startup under X in
+ `IRIX64 6.5 6.5.17m', whether compiled on that relase or
+ an earlier one. It causes no trouble on the other ELF
+ platforms I could test (Irix 6.5.15m, Solaris 8, Debian
+ Potato x86, Debian Woody SPARC); however, it's reported
+ to cause crashes under some version of GNU/Linux. It's
+ not yet clear what's changed in that Irix version to
+ cause the problem, or why the fix sometimes fails under
+ GNU/Linux. There's probably no good reason to have
+ something Irix-specific here, but this will have to do
+ for now. IRIX6_5 is the most specific macro we have to
+ test. -- fx 2002-10-01
+
+ The issue _looks_ as though it's gone away on 6.5.18m,
+ but maybe it's still lurking, to be triggered by some
+ change in the binary. It appears to concern the dynamic
+ loader, but I never got anywhere with an SGI support call
+ seeking clues. -- fx 2002-11-29. */
+#ifdef IRIX6_5
|| !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
".got")
#endif
#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
- && old_mdebug_index != -1)
+ && old_mdebug_index != -1)
{
- int diff = NEW_SECTION_H(nn).sh_offset
- - OLD_SECTION_H(old_mdebug_index).sh_offset;
+ int diff = NEW_SECTION_H(nn).sh_offset
+ - OLD_SECTION_H(old_mdebug_index).sh_offset;
HDRR *phdr = (HDRR *)(NEW_SECTION_H (nn).sh_offset + new_base);
if (diff)
#endif /* __sony_news && _SYSTYPE_SYSV */
#if __sgi
- /* Adjust the HDRR offsets in .mdebug and copy the
+ /* Adjust the HDRR offsets in .mdebug and copy the
line data if it's in its usual 'hole' in the object.
Makes the new file debuggable with dbx.
patches up two problems: the absolute file offsets
/* This loop seeks out relocation sections for the data section, so
that it can undo relocations performed by the runtime linker. */
+#ifndef BROKEN_NOCOMBRELOC
for (n = new_file_h->e_shnum - 1; n; n--)
{
ElfW(Shdr) section = NEW_SECTION_H (n);
/* Cause a compilation error if anyone uses n instead of nn below. */
struct {int a;} n;
+ (void)n.a; /* Prevent `unused variable' warnings. */
- switch (section.sh_type)
+ switch (section.sh_type)
{
default:
break;
".lit4")
|| !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
".lit8")
-#if __sgi
+#ifdef IRIX6_5 /* see above */
|| !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
".got")
#endif
break;
}
}
+#else /* BROKEN_NOCOMBRELOC */
+ for (n = 1, n_unreloc_sections = 0; n < new_file_h->e_shnum; n++)
+ if (!strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".data")
+ || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".sdata")
+ || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".lit4")
+ || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".lit8")
+#ifdef IRIX6_5 /* see above */
+ || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".got")
+#endif
+ || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".sdata1")
+ || !strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".data1"))
+ {
+ assert (n_unreloc_sections
+ < (sizeof (unreloc_sections) / sizeof (unreloc_sections[0])));
+ unreloc_sections[n_unreloc_sections++] = n;
+#ifdef DEBUG
+ fprintf (stderr, "section %d: %s\n", n,
+ old_section_names + NEW_SECTION_H (n).sh_name);
+#endif
+ }
+
+ for (n = new_file_h->e_shnum - 1; n; n--)
+ {
+ ElfW(Shdr) section = NEW_SECTION_H (n);
+ caddr_t reloc, end;
+ ElfW(Addr) addr, offset;
+ int target;
+
+ switch (section.sh_type)
+ {
+ default:
+ break;
+ case SHT_REL:
+ case SHT_RELA:
+ /* This code handles two different size structs, but there should
+ be no harm in that provided that r_offset is always the first
+ member. */
+ for (reloc = old_base + section.sh_offset,
+ end = reloc + section.sh_size;
+ reloc < end;
+ reloc += section.sh_entsize)
+ {
+ addr = ((ElfW(Rel) *) reloc)->r_offset;
+#ifdef __alpha__
+ /* The Alpha ELF binutils currently have a bug that
+ sometimes results in relocs that contain all
+ zeroes. Work around this for now... */
+ if (addr == 0)
+ continue;
+#endif
+ for (nn = 0; nn < n_unreloc_sections; nn++)
+ {
+ target = unreloc_sections[nn];
+ if (NEW_SECTION_H (target).sh_addr <= addr
+ && addr < (NEW_SECTION_H (target).sh_addr +
+ NEW_SECTION_H (target).sh_size))
+ {
+ offset = (NEW_SECTION_H (target).sh_addr -
+ NEW_SECTION_H (target).sh_offset);
+ memcpy (new_base + addr - offset,
+ old_base + addr - offset,
+ sizeof (ElfW(Addr)));
+#ifdef DEBUG
+ fprintf (stderr, "unrelocate: [%08lx] <= %08lx\n",
+ (long) addr,
+ (long) *((long *) (new_base + addr - offset)));
+#endif
+ break;
+ }
+ }
+ }
+ break;
+ }
+ }
+#endif /* BROKEN_NOCOMBRELOC */
/* Write out new_file, and free the buffers. */
if (write (new_file, new_base, new_file_size) != new_file_size)
- fatal ("Didn't write %d bytes to %s: errno %d\n",
+#ifndef emacs
+ fatal ("Didn't write %d bytes: errno %d\n",
+ new_file_size, errno);
+#else
+ fatal ("Didn't write %d bytes to %s: errno %d\n",
new_file_size, new_base, errno);
-
+#endif
munmap (old_base, old_file_size);
munmap (new_base, new_file_size);
if (chmod (new_name, stat_buf.st_mode) == -1)
fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
}
+
+/* arch-tag: e02e1512-95e2-4ef0-bba7-b6bce658f1e3
+ (do not change this comment) */