Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12:Update
emacs
emacs-24.3-unexelf.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File emacs-24.3-unexelf.patch of Package emacs
--- src/unexelf.c | 1185 ++++++++++++++-------------------------------------------- 1 file changed, 289 insertions(+), 896 deletions(-) --- src/unexelf.c +++ src/unexelf.c 2016-12-22 07:57:10.002804066 +0000 @@ -1,12 +1,12 @@ -/* Copyright (C) 1985-1988, 1990, 1992, 1999-2013 Free Software +/* Copyright (C) 1985-1988, 1990, 1992, 1999-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +the Free Software Foundation, either version 3 of the License, or (at +your option) any later version. GNU Emacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -40,364 +40,24 @@ what you give them. Help stamp out sof * On some machines, an existing old_name file is required. * */ - -/* Even more heavily modified by james@bigtex.cactus.org of Dell Computer Co. - * ELF support added. - * - * Basic theory: the data space of the running process needs to be - * dumped to the output file. Normally we would just enlarge the size - * of .data, scooting everything down. But we can't do that in ELF, - * because there is often something between the .data space and the - * .bss space. - * - * In the temacs dump below, notice that the Global Offset Table - * (.got) and the Dynamic link data (.dynamic) come between .data1 and - * .bss. It does not work to overlap .data with these fields. - * - * The solution is to create a new .data segment. This segment is - * filled with data from the current process. Since the contents of - * various sections refer to sections by index, the new .data segment - * is made the last in the table to avoid changing any existing index. - - * This is an example of how the section headers are changed. "Addr" - * is a process virtual address. "Offset" is a file offset. - -raid:/nfs/raid/src/dist-18.56/src> dump -h temacs - -temacs: - - **** 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 - - [2] 5 2 0x80480e8 0xe8 0x388 .hash - 3 0 0x4 0x4 - - [3] 11 2 0x8048470 0x470 0x7f0 .dynsym - 4 1 0x4 0x10 - - [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr - 0 0 0x1 0 - - [5] 9 2 0x8049010 0x1010 0x338 .rel.plt - 3 7 0x4 0x8 - - [6] 1 6 0x8049348 0x1348 0x3 .init - 0 0 0x4 0 - - [7] 1 6 0x804934c 0x134c 0x680 .plt - 0 0 0x4 0x4 - - [8] 1 6 0x80499cc 0x19cc 0x3c56f .text - 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 - - [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1 - 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 - - [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got - 0 0 0x4 0x4 - - [15] 6 3 0x80a9874 0x60874 0x80 .dynamic - 4 0 0x4 0x8 - - [16] 8 3 0x80a98f4 0x608f4 0x449c .bss - 0 0 0x4 0 - - [17] 2 0 0 0x608f4 0x9b90 .symtab - 18 371 0x4 0x10 - - [18] 3 0 0 0x6a484 0x8526 .strtab - 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 - - raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs - - xemacs: - - **** 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 - - [2] 5 2 0x80480e8 0xe8 0x388 .hash - 3 0 0x4 0x4 - - [3] 11 2 0x8048470 0x470 0x7f0 .dynsym - 4 1 0x4 0x10 - - [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr - 0 0 0x1 0 - - [5] 9 2 0x8049010 0x1010 0x338 .rel.plt - 3 7 0x4 0x8 - - [6] 1 6 0x8049348 0x1348 0x3 .init - 0 0 0x4 0 - - [7] 1 6 0x804934c 0x134c 0x680 .plt - 0 0 0x4 0x4 - - [8] 1 6 0x80499cc 0x19cc 0x3c56f .text - 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 - - [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1 - 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 - - [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got - 0 0 0x4 0x4 - - [15] 6 3 0x80a9874 0x60874 0x80 .dynamic - 4 0 0x4 0x8 - - [16] 8 3 0x80c6800 0x7d800 0 .bss - 0 0 0x4 0 - - [17] 2 0 0 0x7d800 0x9b90 .symtab - 18 371 0x4 0x10 - - [18] 3 0 0 0x87390 0x8526 .strtab - 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 - - [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. - - raid:/nfs/raid/src/dist-18.56/src> dump -f temacs - - temacs: - - **** 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 - - raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs - - xemacs: - - **** 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 - - * 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 - - temacs: - ***** PROGRAM EXECUTION HEADER ***** - Type Offset Vaddr Paddr - Filesz Memsz Flags Align - - 6 0x34 0x8048034 0 - 0xa0 0xa0 5 0 - - 3 0xd4 0 0 - 0x13 0 4 0 - - 1 0x34 0x8048034 0 - 0x3f2f9 0x3f2f9 5 0x1000 - - 1 0x3f330 0x8088330 0 - 0x215c4 0x25a60 7 0x1000 - - 2 0x60874 0x80a9874 0 - 0x80 0 7 0 - - raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs - - xemacs: - ***** PROGRAM EXECUTION HEADER ***** - Type Offset Vaddr Paddr - Filesz Memsz Flags Align - - 6 0x34 0x8048034 0 - 0xa0 0xa0 5 0 - - 3 0xd4 0 0 - 0x13 0 4 0 - - 1 0x34 0x8048034 0 - 0x3f2f9 0x3f2f9 5 0x1000 - - 1 0x3f330 0x8088330 0 - 0x3e4d0 0x3e4d0 7 0x1000 - - 2 0x60874 0x80a9874 0 - 0x80 0 7 0 - - - */ - -/* Modified by wtien@urbana.mcd.mot.com of Motorola Inc. - * - * The above mechanism does not work if the unexeced ELF file is being - * re-layout by other applications (such as `strip'). All the applications - * that re-layout the internal of ELF will layout all sections in ascending - * order of their file offsets. After the re-layout, the data2 section will - * still be the LAST section in the section header vector, but its file offset - * is now being pushed far away down, and causes part of it not to be mapped - * in (ie. not covered by the load segment entry in PHDR vector), therefore - * causes the new binary to fail. - * - * The solution is to modify the unexec algorithm to insert the new data2 - * section header right before the new bss section header, so their file - * offsets will be in the ascending order. Since some of the section's (all - * sections AFTER the bss section) indexes are now changed, we also need to - * modify some fields to make them point to the right sections. This is done - * by macro PATCH_INDEX. All the fields that need to be patched are: - * - * 1. ELF header e_shstrndx field. - * 2. section header sh_link and sh_info field. - * 3. symbol table entry st_shndx field. - * - * The above example now should look like: - - **** 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 - - [2] 5 2 0x80480e8 0xe8 0x388 .hash - 3 0 0x4 0x4 - - [3] 11 2 0x8048470 0x470 0x7f0 .dynsym - 4 1 0x4 0x10 - - [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr - 0 0 0x1 0 - - [5] 9 2 0x8049010 0x1010 0x338 .rel.plt - 3 7 0x4 0x8 - - [6] 1 6 0x8049348 0x1348 0x3 .init - 0 0 0x4 0 - - [7] 1 6 0x804934c 0x134c 0x680 .plt - 0 0 0x4 0x4 - - [8] 1 6 0x80499cc 0x19cc 0x3c56f .text - 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 - - [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1 - 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 - - [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got - 0 0 0x4 0x4 - - [15] 6 3 0x80a9874 0x60874 0x80 .dynamic - 4 0 0x4 0x8 - - [16] 1 3 0x80a98f4 0x608f4 0x1cf0c .data - 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 - - [19] 3 0 0 0x87390 0x8526 .strtab - 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 - - */ /* We do not use mmap because that fails with NFS. Instead we read the whole file, modify it, and write it out. */ #include <config.h> -#include <unexec.h> - -extern void fatal (const char *msgid, ...); +#include "unexec.h" +#include "lisp.h" -#include <sys/types.h> +#include <errno.h> +#include <fcntl.h> +#include <limits.h> +#include <memory.h> #include <stdint.h> #include <stdio.h> #include <sys/stat.h> -#include <memory.h> -#include <errno.h> +#include <sys/types.h> #include <unistd.h> -#include <fcntl.h> + #if !defined (__NetBSD__) && !defined (__OpenBSD__) #include <elf.h> #endif /* not __NetBSD__ and not __OpenBSD__ */ @@ -519,108 +179,53 @@ typedef struct { # define ElfW(type) ElfExpandBitsW (ELFSIZE, type) #endif +/* The code often converts ElfW (Half) values like e_shentsize to ptrdiff_t; + check that this doesn't lose information. */ +#include <intprops.h> +#include <verify.h> +verify ((! TYPE_SIGNED (ElfW (Half)) + || PTRDIFF_MIN <= TYPE_MINIMUM (ElfW (Half))) + && TYPE_MAXIMUM (ElfW (Half)) <= PTRDIFF_MAX); + +#ifdef UNEXELF_DEBUG +# define DEBUG_LOG(expr) fprintf (stderr, #expr " 0x%jx\n", (uintmax_t) (expr)) +#endif + /* Get the address of a particular section or program header entry, * accounting for the size of the entries. */ -/* - On PPC Reference Platform running Solaris 2.5.1 - the plt section is also of type NOBI like the bss section. - (not really stored) and therefore sections after the bss - section start at the plt offset. The plt section is always - the one just before the bss section. - Thus, we modify the test from - if (NEW_SECTION_H (nn).sh_offset >= new_data2_offset) - to - if (NEW_SECTION_H (nn).sh_offset >= - OLD_SECTION_H (old_bss_index-1).sh_offset) - This is just a hack. We should put the new data section - before the .plt section. - And we should not have this routine at all but use - the libelf library to read the old file and create the new - file. - The changed code is minimal and depends on prep set in m/prep.h - Erik Deumens - Quantum Theory Project - University of Florida - deumens@qtp.ufl.edu - Apr 23, 1996 - */ -#define OLD_SECTION_H(n) \ - (*(ElfW (Shdr) *) ((byte *) old_section_h + old_file_h->e_shentsize * (n))) -#define NEW_SECTION_H(n) \ - (*(ElfW (Shdr) *) ((byte *) new_section_h + new_file_h->e_shentsize * (n))) -#define NEW_PROGRAM_H(n) \ - (*(ElfW (Phdr) *) ((byte *) new_program_h + new_file_h->e_phentsize * (n))) - -#define PATCH_INDEX(n) \ - do { \ - if ((int) (n) >= old_bss_index) \ - (n)++; } while (0) -typedef unsigned char byte; - -/* Round X up to a multiple of Y. */ - -static ElfW (Addr) -round_up (ElfW (Addr) x, ElfW (Addr) y) +static void * +entry_address (void *section_h, ptrdiff_t idx, ptrdiff_t entsize) { - int rem = x % y; - if (rem == 0) - return x; - return x - rem + y; + char *h = section_h; + return h + idx * entsize; } -/* Return the index of the section named NAME. - SECTION_NAMES, FILE_NAME and FILE_H give information - about the file we are looking in. - - If we don't find the section NAME, that is a fatal error - if NOERROR is 0; we return -1 if NOERROR is nonzero. */ - -static int -find_section (const char *name, const char *section_names, const char *file_name, - ElfW (Ehdr) *old_file_h, ElfW (Shdr) *old_section_h, int noerror) -{ - int idx; - - for (idx = 1; idx < old_file_h->e_shnum; idx++) - { -#ifdef DEBUG - fprintf (stderr, "Looking for %s - found %s\n", name, - section_names + OLD_SECTION_H (idx).sh_name); -#endif - if (!strcmp (section_names + OLD_SECTION_H (idx).sh_name, - name)) - break; - } - if (idx == old_file_h->e_shnum) - { - if (noerror) - return -1; - else - fatal ("Can't find %s in %s.\n", name, file_name); - } +#define OLD_SECTION_H(n) \ + (*(ElfW (Shdr) *) entry_address (old_section_h, n, old_file_h->e_shentsize)) +#define NEW_SECTION_H(n) \ + (*(ElfW (Shdr) *) entry_address (new_section_h, n, new_file_h->e_shentsize)) +#define OLD_PROGRAM_H(n) \ + (*(ElfW (Phdr) *) entry_address (old_program_h, n, old_file_h->e_phentsize)) - return idx; -} +typedef unsigned char byte; /* **************************************************************** * unexec * * driving logic. * - * In ELF, this works by replacing the old .bss section with a new - * .data section, and inserting an empty .bss immediately afterwards. + * In ELF, this works by replacing the old bss SHT_NOBITS section with + * a new, larger, SHT_PROGBITS section. * */ void unexec (const char *new_name, const char *old_name) { - int new_file, old_file, new_file_size; - -#if defined (emacs) || !defined (DEBUG) + int new_file, old_file; + off_t new_file_size; void *new_break; -#endif /* Pointers to the base of the image of the two files. */ caddr_t old_base, new_base; @@ -637,40 +242,34 @@ unexec (const char *new_name, const char ElfW (Phdr) *old_program_h, *new_program_h; ElfW (Shdr) *old_section_h, *new_section_h; - /* Point to the section name table in the old file. */ - char *old_section_names; + /* Point to the section name table. */ + char *old_section_names, *new_section_names; + ElfW (Phdr) *old_bss_seg, *new_bss_seg; ElfW (Addr) old_bss_addr, new_bss_addr; - ElfW (Word) old_bss_size, new_data2_size; - ElfW (Off) new_data2_offset; - ElfW (Addr) new_data2_addr; - ElfW (Off) old_bss_offset; - ElfW (Word) new_data2_incr; - - int n, nn; - int old_bss_index, old_sbss_index, old_plt_index; - int old_data_index, new_data2_index; -#if defined _SYSTYPE_SYSV || defined __sgi - int old_mdebug_index; -#endif + ElfW (Word) old_bss_size, bss_size_growth, new_data2_size; + ElfW (Off) old_bss_offset, new_data2_offset; + + ptrdiff_t n; + ptrdiff_t old_bss_index; struct stat stat_buf; - int old_file_size; + off_t old_file_size; /* Open the old file, allocate a buffer of the right size, and read in the file contents. */ - old_file = open (old_name, O_RDONLY); + old_file = emacs_open (old_name, O_RDONLY, 0); if (old_file < 0) - fatal ("Can't open %s for reading: errno %d\n", old_name, errno); + fatal ("Can't open %s for reading: %s", old_name, strerror (errno)); - if (fstat (old_file, &stat_buf) == -1) - fatal ("Can't fstat (%s): errno %d\n", old_name, errno); + if (fstat (old_file, &stat_buf) != 0) + fatal ("Can't fstat (%s): %s", old_name, strerror (errno)); #if MAP_ANON == 0 - mmap_fd = open ("/dev/zero", O_RDONLY); + mmap_fd = emacs_open ("/dev/zero", O_RDONLY, 0); if (mmap_fd < 0) - fatal ("Can't open /dev/zero for reading: errno %d\n", errno, 0); + fatal ("Can't open /dev/zero for reading: %s", strerror (errno)); #endif /* We cannot use malloc here because that may use sbrk. If it does, @@ -678,13 +277,15 @@ unexec (const char *new_name, const char extra careful to use the correct value of sbrk(0) after allocating all buffers in the code below, which we aren't. */ old_file_size = stat_buf.st_size; + if (! (0 <= old_file_size && old_file_size <= SIZE_MAX)) + fatal ("File size out of range"); 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, 0); + fatal ("Can't allocate buffer for %s: %s", old_name, strerror (errno)); - 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); + if (read (old_file, old_base, old_file_size) != old_file_size) + fatal ("Didn't read all of %s: %s", old_name, strerror (errno)); /* Get pointers to headers & section names */ @@ -694,326 +295,172 @@ unexec (const char *new_name, const char old_section_names = (char *) old_base + OLD_SECTION_H (old_file_h->e_shstrndx).sh_offset; - /* Find the mdebug section, if any. */ - -#if defined _SYSTYPE_SYSV || defined __sgi - old_mdebug_index = find_section (".mdebug", old_section_names, - old_name, old_file_h, old_section_h, 1); -#endif - - /* Find the old .bss section. Figure out parameters of the new - data2 and bss sections. */ - - old_bss_index = find_section (".bss", old_section_names, - old_name, old_file_h, old_section_h, 0); - - 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_NOBITS) - 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) + /* Find the PT_LOAD header covering the highest address. This + segment will be where bss sections are located, past p_filesz. */ + old_bss_seg = 0; + for (n = old_file_h->e_phnum; --n >= 0; ) { - old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr; - old_bss_size = OLD_SECTION_H (old_bss_index).sh_size; - old_bss_offset = OLD_SECTION_H (old_bss_index).sh_offset; - 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))) + ElfW (Phdr) *seg = &OLD_PROGRAM_H (n); + if (seg->p_type == PT_LOAD + && (old_bss_seg == 0 + || seg->p_vaddr > old_bss_seg->p_vaddr)) + old_bss_seg = seg; + } + + /* Note that old_bss_addr may be lower than the first bss section + address, since the section may need aligning. */ + old_bss_addr = old_bss_seg->p_vaddr + old_bss_seg->p_filesz; + old_bss_offset = old_bss_seg->p_offset + old_bss_seg->p_filesz; + old_bss_size = old_bss_seg->p_memsz - old_bss_seg->p_filesz; + + /* Find the last bss style section in the bss segment range. */ + old_bss_index = -1; + for (n = old_file_h->e_shnum; --n > 0; ) { - 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; - old_bss_offset = OLD_SECTION_H (old_plt_index).sh_offset; - new_data2_index = old_plt_index; + ElfW (Shdr) *shdr = &OLD_SECTION_H (n); + if (shdr->sh_type == SHT_NOBITS + && shdr->sh_addr >= old_bss_addr + && shdr->sh_addr + shdr->sh_size <= old_bss_addr + old_bss_size + && (old_bss_index == -1 + || OLD_SECTION_H (old_bss_index).sh_addr < shdr->sh_addr)) + old_bss_index = n; } - else - { - old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr; - old_bss_size = OLD_SECTION_H (old_bss_index).sh_size - + OLD_SECTION_H (old_sbss_index).sh_size; - old_bss_offset = OLD_SECTION_H (old_sbss_index).sh_offset; - new_data2_index = old_sbss_index; - } - - /* Find the old .data section. Figure out parameters of - the new data2 and bss sections. */ - old_data_index = find_section (".data", old_section_names, - old_name, old_file_h, old_section_h, 0); + if (old_bss_index == -1) + fatal ("no bss section found"); -#if defined (emacs) || !defined (DEBUG) new_break = sbrk (0); new_bss_addr = (ElfW (Addr)) new_break; -#else - new_bss_addr = old_bss_addr + old_bss_size + 0x1234; -#endif - new_data2_addr = old_bss_addr; - new_data2_size = new_bss_addr - old_bss_addr; - new_data2_offset = OLD_SECTION_H (old_data_index).sh_offset - + (new_data2_addr - OLD_SECTION_H (old_data_index).sh_addr); - /* This is the amount by which the sections following the bss sections - must be shifted in the image. It can differ from new_data2_size if - the end of the old .data section (and thus the offset of the .bss - section) was unaligned. */ - new_data2_incr = new_data2_size + (new_data2_offset - old_bss_offset); - -#ifdef DEBUG - fprintf (stderr, "old_bss_index %d\n", old_bss_index); - fprintf (stderr, "old_bss_addr %x\n", old_bss_addr); - fprintf (stderr, "old_bss_size %x\n", old_bss_size); - fprintf (stderr, "old_bss_offset %x\n", old_bss_offset); - fprintf (stderr, "new_bss_addr %x\n", new_bss_addr); - fprintf (stderr, "new_data2_addr %x\n", new_data2_addr); - fprintf (stderr, "new_data2_size %x\n", new_data2_size); - fprintf (stderr, "new_data2_offset %x\n", new_data2_offset); - fprintf (stderr, "new_data2_incr %x\n", new_data2_incr); + bss_size_growth = new_bss_addr - old_bss_addr; + new_data2_size = bss_size_growth; + new_data2_size += alignof (ElfW (Shdr)) - 1; + new_data2_size -= new_data2_size % alignof (ElfW (Shdr)); + + new_data2_offset = old_bss_offset; + +#ifdef UNEXELF_DEBUG + fprintf (stderr, "old_bss_index %td\n", old_bss_index); + DEBUG_LOG (old_bss_addr); + DEBUG_LOG (old_bss_size); + DEBUG_LOG (old_bss_offset); + DEBUG_LOG (new_bss_addr); + DEBUG_LOG (new_data2_size); + DEBUG_LOG (new_data2_offset); #endif - if ((uintptr_t) new_bss_addr < (uintptr_t) old_bss_addr + old_bss_size) - fatal (".bss shrank when undumping???\n", 0, 0); + if (new_bss_addr < old_bss_addr + old_bss_size) + fatal (".bss shrank when undumping"); /* Set the output file to the right size. Allocate a buffer to hold the image of the new file. Set pointers to various interesting - objects. stat_buf still has old_file data. */ + objects. */ - new_file = open (new_name, O_RDWR | O_CREAT, 0666); + new_file = emacs_open (new_name, O_RDWR | O_CREAT, 0777); if (new_file < 0) - fatal ("Can't creat (%s): errno %d\n", new_name, errno); + fatal ("Can't creat (%s): %s", new_name, strerror (errno)); - new_file_size = stat_buf.st_size + old_file_h->e_shentsize + new_data2_incr; + new_file_size = old_file_size + new_data2_size; if (ftruncate (new_file, new_file_size)) - fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno); + fatal ("Can't ftruncate (%s): %s", new_name, strerror (errno)); 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, 0); - - new_file_h = (ElfW (Ehdr) *) new_base; - new_program_h = (ElfW (Phdr) *) ((byte *) new_base + old_file_h->e_phoff); - new_section_h = (ElfW (Shdr) *) - ((byte *) new_base + old_file_h->e_shoff + new_data2_incr); + fatal ("Can't allocate buffer for %s: %s", old_name, strerror (errno)); /* Make our new file, program and section headers as copies of the originals. */ + new_file_h = (ElfW (Ehdr) *) new_base; memcpy (new_file_h, old_file_h, old_file_h->e_ehsize); - memcpy (new_program_h, old_program_h, - old_file_h->e_phnum * old_file_h->e_phentsize); - /* Modify the e_shstrndx if necessary. */ - PATCH_INDEX (new_file_h->e_shstrndx); + /* Fix up file header. Section header is further away now. */ - /* Fix up file header. We'll add one section. Section header is - further away now. */ + if (new_file_h->e_shoff >= old_bss_offset) + new_file_h->e_shoff += new_data2_size; - new_file_h->e_shoff += new_data2_incr; - new_file_h->e_shnum += 1; + new_program_h = (ElfW (Phdr) *) ((byte *) new_base + new_file_h->e_phoff); + new_section_h = (ElfW (Shdr) *) ((byte *) new_base + new_file_h->e_shoff); -#ifdef DEBUG - fprintf (stderr, "Old section offset %x\n", old_file_h->e_shoff); - fprintf (stderr, "Old section count %d\n", old_file_h->e_shnum); - fprintf (stderr, "New section offset %x\n", new_file_h->e_shoff); - fprintf (stderr, "New section count %d\n", new_file_h->e_shnum); -#endif - - /* Fix up a new program header. Extend the writable data segment so - that the bss area is covered too. Find that segment by looking - for a segment that ends just before the .bss area. Make sure - that no segments are above the new .data2. Put a loop at the end - to adjust the offset and address of any segment that is above - data2, just in case we decide to allow this later. */ + memcpy (new_program_h, old_program_h, + old_file_h->e_phnum * old_file_h->e_phentsize); + memcpy (new_section_h, old_section_h, + old_file_h->e_shnum * old_file_h->e_shentsize); - for (n = new_file_h->e_phnum - 1; n >= 0; n--) - { - /* Compute maximum of all requirements for alignment of section. */ - ElfW (Word) alignment = (NEW_PROGRAM_H (n)).p_align; - if ((OLD_SECTION_H (old_bss_index)).sh_addralign > alignment) - alignment = OLD_SECTION_H (old_bss_index).sh_addralign; - -#ifdef __sgi - /* According to r02kar@x4u2.desy.de (Karsten Kuenne) - and oliva@gnu.org (Alexandre Oliva), on IRIX 5.2, we - always get "Program segment above .bss" when dumping - when the executable doesn't have an sbss section. */ - if (old_sbss_index != -1) -#endif /* __sgi */ - if (NEW_PROGRAM_H (n).p_vaddr + NEW_PROGRAM_H (n).p_filesz - > (old_sbss_index == -1 - ? old_bss_addr - : round_up (old_bss_addr, alignment))) - fatal ("Program segment above .bss in %s\n", old_name, 0); - - if (NEW_PROGRAM_H (n).p_type == PT_LOAD - && (round_up ((NEW_PROGRAM_H (n)).p_vaddr - + (NEW_PROGRAM_H (n)).p_filesz, - alignment) - == round_up (old_bss_addr, alignment))) - break; - } - if (n < 0) - fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0); +#ifdef UNEXELF_DEBUG + DEBUG_LOG (old_file_h->e_shoff); + fprintf (stderr, "Old section count %td\n", (ptrdiff_t) old_file_h->e_shnum); + DEBUG_LOG (new_file_h->e_shoff); + fprintf (stderr, "New section count %td\n", (ptrdiff_t) new_file_h->e_shnum); +#endif - /* Make sure that the size includes any padding before the old .bss - section. */ - NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; - NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz; + /* Fix up program header. Extend the writable data segment so + that the bss area is covered too. */ -#if 0 /* Maybe allow section after data2 - does this ever happen? */ - for (n = new_file_h->e_phnum - 1; n >= 0; n--) - { - if (NEW_PROGRAM_H (n).p_vaddr - && NEW_PROGRAM_H (n).p_vaddr >= new_data2_addr) - NEW_PROGRAM_H (n).p_vaddr += new_data2_size - old_bss_size; + new_bss_seg = new_program_h + (old_bss_seg - old_program_h); + new_bss_seg->p_filesz = new_bss_addr - new_bss_seg->p_vaddr; + new_bss_seg->p_memsz = new_bss_seg->p_filesz; - if (NEW_PROGRAM_H (n).p_offset >= new_data2_offset) - NEW_PROGRAM_H (n).p_offset += new_data2_incr; - } -#endif + /* Copy over what we have in memory now for the bss area. */ + memcpy (new_base + new_data2_offset, (caddr_t) old_bss_addr, + bss_size_growth); - /* Fix up section headers based on new .data2 section. Any section - whose offset or virtual address is after the new .data2 section - gets its value adjusted. .bss size becomes zero and new address - is set. data2 section header gets added by copying the existing - .data header and modifying the offset, address and size. */ - - /* Walk through all section headers, insert the new data2 section right - before the new bss section. */ - for (n = 1, nn = 1; n < (int) old_file_h->e_shnum; n++, nn++) + /* Walk through all section headers, copying data and updating. */ + for (n = 1; n < old_file_h->e_shnum; n++) { caddr_t src; - /* If it is (s)bss section, insert the new data2 section before it. */ - /* new_data2_index is the index of either old_sbss or old_bss, that was - chosen as a section for new_data2. */ - if (n == new_data2_index) - { - /* Steal the data section header for this data2 section. */ - memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (old_data_index), - new_file_h->e_shentsize); - - NEW_SECTION_H (nn).sh_addr = new_data2_addr; - NEW_SECTION_H (nn).sh_offset = new_data2_offset; - NEW_SECTION_H (nn).sh_size = new_data2_size; - /* Use the bss section's alignment. This will assure that the - new data2 section always be placed in the same spot as the old - bss section by any other application. */ - NEW_SECTION_H (nn).sh_addralign = OLD_SECTION_H (n).sh_addralign; - - /* Now copy over what we have in the memory now. */ - memcpy (NEW_SECTION_H (nn).sh_offset + new_base, - (caddr_t) OLD_SECTION_H (n).sh_addr, - new_data2_size); - nn++; - } - - memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n), - old_file_h->e_shentsize); + ElfW (Shdr) *old_shdr = &OLD_SECTION_H (n); + ElfW (Shdr) *new_shdr = &NEW_SECTION_H (n); - 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_plt_index - ) + if (new_shdr->sh_type == SHT_NOBITS + && new_shdr->sh_addr >= old_bss_addr + && (new_shdr->sh_addr + new_shdr->sh_size + <= old_bss_addr + old_bss_size)) { - /* NN should be `old_s?bss_index + 1' at this point. */ - NEW_SECTION_H (nn).sh_offset = new_data2_offset + new_data2_size; - NEW_SECTION_H (nn).sh_addr = new_data2_addr + new_data2_size; - /* Let the new bss section address alignment be the same as the - section address alignment followed the old bss section, so - this section will be placed in exactly the same place. */ - NEW_SECTION_H (nn).sh_addralign = OLD_SECTION_H (nn).sh_addralign; - NEW_SECTION_H (nn).sh_size = 0; - } - else - { - /* Any section that was originally placed after the .bss - section should now be off by NEW_DATA2_INCR. 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. - -> dump -h temacs - -temacs: - - **** SECTION HEADER TABLE **** -[No] Type Flags Addr Offset Size Name - Link Info Adralgn Entsize - -[22] 1 3 0x335150 0x315150 0x4 .data.rel.local - 0 0 0x4 0 - -[23] 8 3 0x335158 0x315158 0x42720 .bss - 0 0 0x8 0 - -[24] 2 0 0 0x315154 0x1c9d0 .symtab - 25 1709 0x4 0x10 - */ - - if (NEW_SECTION_H (nn).sh_offset >= old_bss_offset - || (NEW_SECTION_H (nn).sh_offset + NEW_SECTION_H (nn).sh_size - > new_data2_offset)) - NEW_SECTION_H (nn).sh_offset += new_data2_incr; - - /* Any section that was originally placed after the section - header table should now be off by the size of one section - header table entry. */ - if (NEW_SECTION_H (nn).sh_offset > new_file_h->e_shoff) - NEW_SECTION_H (nn).sh_offset += new_file_h->e_shentsize; + /* This section now has file backing. */ + new_shdr->sh_type = SHT_PROGBITS; + + /* SHT_NOBITS sections do not need a valid sh_offset, so it + might be incorrect. Write the correct value. */ + new_shdr->sh_offset = (new_shdr->sh_addr - new_bss_seg->p_vaddr + + new_bss_seg->p_offset); + + /* If this is was a SHT_NOBITS .plt section, then it is + probably a PowerPC PLT. If it is PowerPC64 ELFv1 then + glibc ld.so doesn't initialize the toc pointer word. A + non-zero toc pointer word can defeat Power7 thread safety + during lazy update of a PLT entry. This only matters if + emacs becomes multi-threaded. */ + if (strcmp (old_section_names + new_shdr->sh_name, ".plt") == 0) + memset (new_shdr->sh_offset + new_base, 0, new_shdr->sh_size); + + /* Extend the size of the last bss section to cover dumped + data. */ + if (n == old_bss_index) + new_shdr->sh_size = new_bss_addr - new_shdr->sh_addr; + + /* We have already copied this section from the current + process. */ + continue; } - /* If any section hdr refers to the section after the new .data - section, make it refer to next one because we have inserted - a new section in between. */ - - PATCH_INDEX (NEW_SECTION_H (nn).sh_link); - /* For symbol tables, info is a symbol table index, - so don't change it. */ - 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 = - round_up (NEW_SECTION_H (nn).sh_offset, - NEW_SECTION_H (nn).sh_addralign); - NEW_SECTION_H (nn).sh_type = SHT_PROGBITS; - } + /* Any section that was originally placed after the .bss + section should now be offset by NEW_DATA2_SIZE. */ + if (new_shdr->sh_offset >= old_bss_offset) + new_shdr->sh_offset += new_data2_size; /* Now, start to copy the content of sections. */ - if (NEW_SECTION_H (nn).sh_type == SHT_NULL - || NEW_SECTION_H (nn).sh_type == SHT_NOBITS) + if (new_shdr->sh_type == SHT_NULL + || new_shdr->sh_type == SHT_NOBITS) continue; - /* Write out the sections. .data and .data1 (and data2, called - ".data" in the strings table) get copied from the current process - instead of the old file. */ - 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") + /* Some sections are copied from the current process instead of + the old file. */ + if (!strcmp (old_section_names + new_shdr->sh_name, ".data") + || !strcmp (old_section_names + new_shdr->sh_name, ".sdata") + || !strcmp (old_section_names + new_shdr->sh_name, ".lit4") + || !strcmp (old_section_names + new_shdr->sh_name, ".lit8") /* 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 @@ -1035,67 +482,41 @@ temacs: 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") + || !strcmp (old_section_names + new_shdr->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") - || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), - ".sbss")) - src = (caddr_t) OLD_SECTION_H (n).sh_addr; + || !strcmp (old_section_names + new_shdr->sh_name, ".sdata1") + || !strcmp (old_section_names + new_shdr->sh_name, ".data1")) + src = (caddr_t) old_shdr->sh_addr; else - src = old_base + OLD_SECTION_H (n).sh_offset; - - memcpy (NEW_SECTION_H (nn).sh_offset + new_base, src, - NEW_SECTION_H (nn).sh_size); + src = old_base + old_shdr->sh_offset; -#if defined __alpha__ && !defined __OpenBSD__ - /* Update Alpha COFF symbol table: */ - if (strcmp (old_section_names + OLD_SECTION_H (n).sh_name, ".mdebug") - == 0) - { - pHDRR symhdr = (pHDRR) (NEW_SECTION_H (nn).sh_offset + new_base); - - symhdr->cbLineOffset += new_data2_size; - symhdr->cbDnOffset += new_data2_size; - symhdr->cbPdOffset += new_data2_size; - symhdr->cbSymOffset += new_data2_size; - symhdr->cbOptOffset += new_data2_size; - symhdr->cbAuxOffset += new_data2_size; - symhdr->cbSsOffset += new_data2_size; - symhdr->cbSsExtOffset += new_data2_size; - symhdr->cbFdOffset += new_data2_size; - symhdr->cbRfdOffset += new_data2_size; - symhdr->cbExtOffset += new_data2_size; - } -#endif /* __alpha__ && !__OpenBSD__ */ + memcpy (new_shdr->sh_offset + new_base, src, new_shdr->sh_size); -#if defined (_SYSTYPE_SYSV) - if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG - && old_mdebug_index != -1) +#if (defined __alpha__ && !defined __OpenBSD__) || defined _SYSTYPE_SYSV + /* Update Alpha and MIPS COFF debug symbol table. */ + if (strcmp (old_section_names + new_shdr->sh_name, ".mdebug") == 0 + && new_shdr->sh_offset - old_shdr->sh_offset != 0 +#if defined _SYSTYPE_SYSV + && new_shdr->sh_type == SHT_MIPS_DEBUG +#endif + ) { - 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); + ptrdiff_t diff = new_shdr->sh_offset - old_shdr->sh_offset; + HDRR *phdr = (HDRR *) (new_shdr->sh_offset + new_base); - if (diff) - { - phdr->cbLineOffset += diff; - phdr->cbDnOffset += diff; - phdr->cbPdOffset += diff; - phdr->cbSymOffset += diff; - phdr->cbOptOffset += diff; - phdr->cbAuxOffset += diff; - phdr->cbSsOffset += diff; - phdr->cbSsExtOffset += diff; - phdr->cbFdOffset += diff; - phdr->cbRfdOffset += diff; - phdr->cbExtOffset += diff; - } + phdr->cbLineOffset += diff; + phdr->cbDnOffset += diff; + phdr->cbPdOffset += diff; + phdr->cbSymOffset += diff; + phdr->cbOptOffset += diff; + phdr->cbAuxOffset += diff; + phdr->cbSsOffset += diff; + phdr->cbSsExtOffset += diff; + phdr->cbFdOffset += diff; + phdr->cbRfdOffset += diff; + phdr->cbExtOffset += diff; } -#endif /* _SYSTYPE_SYSV */ +#endif /* __alpha__ || _SYSTYPE_SYSV */ #if __sgi /* Adjust the HDRR offsets in .mdebug and copy the @@ -1106,7 +527,8 @@ temacs: the ld bug that gets the line table in a hole in the elf file rather than in the .mdebug section proper. David Anderson. davea@sgi.com Jan 16,1994. */ - if (n == old_mdebug_index) + if (strcmp (old_section_names + new_shdr->sh_name, ".mdebug") == 0 + && new_shdr->sh_offset - old_shdr->sh_offset != 0) { #define MDEBUGADJUST(__ct,__fileaddr) \ if (n_phdrr->__ct > 0) \ @@ -1114,9 +536,9 @@ temacs: n_phdrr->__fileaddr += movement; \ } - HDRR * o_phdrr = (HDRR *)((byte *)old_base + OLD_SECTION_H (n).sh_offset); - HDRR * n_phdrr = (HDRR *)((byte *)new_base + NEW_SECTION_H (nn).sh_offset); - unsigned movement = new_data2_size; + HDRR *o_phdrr = (HDRR *) ((byte *) old_base + old_shdr->sh_offset); + HDRR *n_phdrr = (HDRR *) ((byte *) new_base + new_shdr->sh_offset); + ptrdiff_t movement = new_shdr->sh_offset - old_shdr->sh_offset; MDEBUGADJUST (idnMax, cbDnOffset); MDEBUGADJUST (ipdMax, cbPdOffset); @@ -1132,60 +554,33 @@ temacs: requires special handling. */ if (n_phdrr->cbLine > 0) { - if (o_phdrr->cbLineOffset > (OLD_SECTION_H (n).sh_offset - + OLD_SECTION_H (n).sh_size)) - { - /* line data is in a hole in elf. do special copy and adjust - for this ld mistake. - */ - n_phdrr->cbLineOffset += movement; + n_phdrr->cbLineOffset += movement; - memcpy (n_phdrr->cbLineOffset + new_base, - o_phdrr->cbLineOffset + old_base, n_phdrr->cbLine); - } - else - { - /* somehow line data is in .mdebug as it is supposed to be. */ - MDEBUGADJUST (cbLine, cbLineOffset); - } + if (o_phdrr->cbLineOffset > (old_shdr->sh_offset + + old_shdr->sh_size)) + /* If not covered by section, it hasn't yet been copied. */ + memcpy (n_phdrr->cbLineOffset + new_base, + o_phdrr->cbLineOffset + old_base, n_phdrr->cbLine); } } #endif /* __sgi */ - - /* If it is the symbol table, its st_shndx field needs to be patched. */ - if (NEW_SECTION_H (nn).sh_type == SHT_SYMTAB - || NEW_SECTION_H (nn).sh_type == SHT_DYNSYM) - { - ElfW (Shdr) *spt = &NEW_SECTION_H (nn); - unsigned int num = spt->sh_size / spt->sh_entsize; - ElfW (Sym) * sym = (ElfW (Sym) *) (NEW_SECTION_H (nn).sh_offset + - new_base); - for (; num--; sym++) - { - if ((sym->st_shndx == SHN_UNDEF) - || (sym->st_shndx == SHN_ABS) - || (sym->st_shndx == SHN_COMMON)) - continue; - - PATCH_INDEX (sym->st_shndx); - } - } } /* Update the symbol values of _edata and _end. */ - for (n = new_file_h->e_shnum - 1; n; n--) + for (n = new_file_h->e_shnum; 0 < --n; ) { byte *symnames; ElfW (Sym) *symp, *symendp; + ElfW (Shdr) *sym_shdr = &NEW_SECTION_H (n); - if (NEW_SECTION_H (n).sh_type != SHT_DYNSYM - && NEW_SECTION_H (n).sh_type != SHT_SYMTAB) + if (sym_shdr->sh_type != SHT_DYNSYM + && sym_shdr->sh_type != SHT_SYMTAB) continue; symnames = ((byte *) new_base - + NEW_SECTION_H (NEW_SECTION_H (n).sh_link).sh_offset); - symp = (ElfW (Sym) *) (NEW_SECTION_H (n).sh_offset + new_base); - symendp = (ElfW (Sym) *) ((byte *)symp + NEW_SECTION_H (n).sh_size); + + NEW_SECTION_H (sym_shdr->sh_link).sh_offset); + symp = (ElfW (Sym) *) (sym_shdr->sh_offset + new_base); + symendp = (ElfW (Sym) *) ((byte *) symp + sym_shdr->sh_size); for (; symp < symendp; symp ++) { @@ -1209,39 +604,54 @@ temacs: if (strncmp ((char *) (symnames + symp->st_name), "_OBJC_", sizeof ("_OBJC_") - 1) == 0) { - caddr_t old, new; - - new = ((symp->st_value - NEW_SECTION_H (symp->st_shndx).sh_addr) - + NEW_SECTION_H (symp->st_shndx).sh_offset + new_base); - /* "Unpatch" index. */ - nn = symp->st_shndx; - if (nn > old_bss_index) - nn--; - if (nn == old_bss_index) - memset (new, 0, symp->st_size); - else + ElfW (Shdr) *new_shdr = &NEW_SECTION_H (symp->st_shndx); + if (new_shdr->sh_type != SHT_NOBITS) { - old = ((symp->st_value - - NEW_SECTION_H (symp->st_shndx).sh_addr) - + OLD_SECTION_H (nn).sh_offset + old_base); - memcpy (new, old, symp->st_size); + ElfW (Shdr) *old_shdr = &OLD_SECTION_H (symp->st_shndx); + ptrdiff_t reladdr = symp->st_value - new_shdr->sh_addr; + ptrdiff_t newoff = reladdr + new_shdr->sh_offset; + + if (old_shdr->sh_type == SHT_NOBITS) + memset (new_base + newoff, 0, symp->st_size); + else + { + ptrdiff_t oldoff = reladdr + old_shdr->sh_offset; + memcpy (new_base + newoff, old_base + oldoff, + symp->st_size); + } } } #endif } } - /* This loop seeks out relocation sections for the data section, so - that it can undo relocations performed by the runtime linker. */ - for (n = new_file_h->e_shnum - 1; n; n--) + /* Modify the names of sections we changed from SHT_NOBITS to + SHT_PROGBITS. This is really just cosmetic, but some tools that + (wrongly) operate on section names rather than types might be + confused by a SHT_PROGBITS .bss section. */ + new_section_names = ((char *) new_base + + NEW_SECTION_H (new_file_h->e_shstrndx).sh_offset); + for (n = new_file_h->e_shnum; 0 < --n; ) { - ElfW (Shdr) section = NEW_SECTION_H (n); + ElfW (Shdr) *old_shdr = &OLD_SECTION_H (n); + ElfW (Shdr) *new_shdr = &NEW_SECTION_H (n); - /* Cause a compilation error if anyone uses n instead of nn below. */ - #define n ((void) 0); - n /* Prevent 'macro "n" is not used' warnings. */ + /* Replace the leading '.' with ','. When .shstrtab is string + merged this will rename both .bss and .rela.bss to ,bss and + .rela,bss. */ + if (old_shdr->sh_type == SHT_NOBITS + && new_shdr->sh_type == SHT_PROGBITS) + *(new_section_names + new_shdr->sh_name) = ','; + } - switch (section.sh_type) + /* This loop seeks out relocation sections for the data section, so + that it can undo relocations performed by the runtime loader. */ + for (n = new_file_h->e_shnum; 0 < --n; ) + { + ElfW (Shdr) *rel_shdr = &NEW_SECTION_H (n); + ElfW (Shdr) *shdr; + + switch (rel_shdr->sh_type) { default: break; @@ -1250,72 +660,55 @@ temacs: /* This code handles two different size structs, but there should be no harm in that provided that r_offset is always the first member. */ - nn = section.sh_info; - if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data") - || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), - ".sdata") - || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), - ".lit4") - || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), - ".lit8") + shdr = &NEW_SECTION_H (rel_shdr->sh_info); + if (!strcmp (old_section_names + shdr->sh_name, ".data") + || !strcmp (old_section_names + shdr->sh_name, ".sdata") + || !strcmp (old_section_names + shdr->sh_name, ".lit4") + || !strcmp (old_section_names + shdr->sh_name, ".lit8") #ifdef IRIX6_5 /* see above */ - || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), - ".got") + || !strcmp (old_section_names + shdr->sh_name, ".got") #endif - || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), - ".sdata1") - || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), - ".data1")) + || !strcmp (old_section_names + shdr->sh_name, ".sdata1") + || !strcmp (old_section_names + shdr->sh_name, ".data1")) { - ElfW (Addr) offset = (NEW_SECTION_H (nn).sh_addr - - NEW_SECTION_H (nn).sh_offset); - caddr_t reloc = old_base + section.sh_offset, end; - for (end = reloc + section.sh_size; reloc < end; - reloc += section.sh_entsize) + ElfW (Addr) offset = shdr->sh_addr - shdr->sh_offset; + caddr_t reloc = old_base + rel_shdr->sh_offset, end; + for (end = reloc + rel_shdr->sh_size; + reloc < end; + reloc += rel_shdr->sh_entsize) { ElfW (Addr) addr = ((ElfW (Rel) *) reloc)->r_offset - 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... */ + /* Ignore R_*_NONE relocs. */ if (((ElfW (Rel) *) reloc)->r_offset == 0) continue; -#endif - memcpy (new_base + addr, old_base + addr, sizeof (ElfW (Addr))); + /* Assume reloc applies to a word. + ??? This is not always true, eg. TLS module/index + pair in .got which occupies two words. */ + memcpy (new_base + addr, old_base + addr, + sizeof (ElfW (Addr))); } } break; } - - #undef n } /* 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", - new_file_size, new_name, errno); + fatal ("Didn't write %lu bytes to %s: %s", + (unsigned long) new_file_size, new_name, strerror (errno)); munmap (old_base, old_file_size); munmap (new_base, new_file_size); /* Close the files and make the new file executable. */ #if MAP_ANON == 0 - close (mmap_fd); + emacs_close (mmap_fd); #endif - if (close (old_file)) - fatal ("Can't close (%s): errno %d\n", old_name, errno); - - if (close (new_file)) - fatal ("Can't close (%s): errno %d\n", new_name, errno); - - if (stat (new_name, &stat_buf) == -1) - fatal ("Can't stat (%s): errno %d\n", new_name, errno); + if (emacs_close (old_file) != 0) + fatal ("Can't close (%s): %s", old_name, strerror (errno)); - n = umask (777); - umask (n); - stat_buf.st_mode |= 0111 & ~n; - if (chmod (new_name, stat_buf.st_mode) == -1) - fatal ("Can't chmod (%s): errno %d\n", new_name, errno); + if (emacs_close (new_file) != 0) + fatal ("Can't close (%s): %s", new_name, strerror (errno)); }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
