From 421f82e5cc8f81ab003247d771bcecbad799be85 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 8 May 1995 09:11:25 +0000 Subject: Sat May 6 11:06:47 1995 Roland McGrath * Makeconfig (+gccwarn): Add -Winline. * hurd/hurdsig.c (_hurd_internal_post_signal): If SS->context is set, avoid abort_rpcs, and use reply and intr ports saved in SS->context. * sysdeps/mach/hurd/i386/trampoline.c: Don't set SS->intr_port from SS->context. Don't clear SS->context. * sysdeps/mach/hurd/i386/sigreturn.c: Don't set SS->intr_port when setting SS->context. If msg_sig_post returns, re-lock and clear SS->context. Fri May 5 10:37:09 1995 Roland McGrath * mach/Makefile (errsystems.c): Comment out generation rule. * sysdeps/mach/_strerror.c: Consider a system unknown if its bad_sub member is null. * mach/mig-alloc.c: Add weak alias to non-__ name. --- sysdeps/i386/dl-machine.h | 37 +++++++++++++++++-------------------- sysdeps/i386/dl-runtime.c | 9 ++++----- 2 files changed, 21 insertions(+), 25 deletions(-) (limited to 'sysdeps/i386') diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 5e1ee2a413..1797ae5b87 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -68,11 +68,10 @@ elf_machine_load_address (void) ++(const Elf32_Rel *) (dynamic_info)[DT_REL]->d_un.d_ptr; /* Perform the relocation specified by RELOC and SYM (which is fully resolved). - LOADADDR is the load address of the object; INFO is an array indexed - by DT_* of the .dynamic section info. */ + MAP is the object containing the reloc. */ static inline void -elf_machine_rel (Elf32_Addr loadaddr, Elf32_Dyn *info[DT_NUM], +elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, Elf32_Addr sym_loadaddr, const Elf32_Sym *sym) { @@ -92,7 +91,7 @@ elf_machine_rel (Elf32_Addr loadaddr, Elf32_Dyn *info[DT_NUM], *reloc_addr += sym_value; break; case R_386_RELATIVE: - *reloc_addr += loadaddr; + *reloc_addr += map->l_addr; break; case R_386_PC32: *reloc_addr = sym_value - (Elf32_Addr) reloc_addr; @@ -105,13 +104,7 @@ elf_machine_rel (Elf32_Addr loadaddr, Elf32_Dyn *info[DT_NUM], /* The i386 never uses Elf32_Rela relocations. */ -static inline void -elf_machine_rela (Elf32_Addr loadaddr, Elf32_Dyn *info[DT_NUM], - const Elf32_Rela *reloc, - Elf32_Addr sym_loadaddr, const Elf32_Sym *sym) -{ - _dl_signal_error (0, "Elf32_Rela relocation requested -- unused on i386"); -} +#define ELF_MACHINE_NO_RELA 1 /* Set up the loaded object described by L so its unrelocated PLT @@ -140,9 +133,16 @@ elf_machine_runtime_setup (struct link_map *l) #define RTLD_START asm ("\ .text\n\ .globl _start\n\ -_start: call _dl_start\n\ - # Save the user entry point address in %ebx.\n\ - movl %eax, %ebx\n\ +.globl _dl_start_user\n\ +_start:\n\ + call _dl_start\n\ +_dl_start_user:\n\ + # Save the user entry point address in %edi.\n\ + movl %eax, %edi\n\ + # Point %ebx at the GOT. +1: call 2f\n\ +2: popl %ebx\n\ + addl $_GLOBAL_OFFSET_TABLE_+[.-2b], %ebx\n\ # Call _dl_init_next to return the address of an initializer\n\ # function to run.\n\ 0: call _dl_init_next@PLT\n\ @@ -160,10 +160,7 @@ _start: call _dl_start\n\ # Loop to call _dl_init_next for the next initializer.\n\ jmp 0b\n\ # Pass our finalizer function to the user in %edx, as per ELF ABI.\n\ -1: call 2f\n\ -2: popl %eax\n\ - addl $_GLOBAL_OFFSET_TABLE_+[.-2b], %eax\n\ - leal _dl_fini@GOT(%eax), %edx\n\ - # Jump to the user entry point.\n\ - jmp *%ebx\n\ + leal _dl_fini@GOT(%ebx), %edx\n\ + # Jump to the user's entry point.\n\ + jmp *%edi\n\ "); diff --git a/sysdeps/i386/dl-runtime.c b/sysdeps/i386/dl-runtime.c index 897524fdd3..1bc569760c 100644 --- a/sysdeps/i386/dl-runtime.c +++ b/sysdeps/i386/dl-runtime.c @@ -17,8 +17,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -register void *sp asm ("%esp"); - #include #include "dynamic-link.h" @@ -30,7 +28,7 @@ register void *sp asm ("%esp"); 0(%esp) identifier for this shared object (struct link_map *) The user expects the real function the PLT refers to to be entered - 8(%esp) as the top of stack. */ + with 8(%esp) as the top of stack. */ void _dl_runtime_resolve (Elf32_Word reloc_offset) @@ -63,14 +61,15 @@ _dl_runtime_resolve (Elf32_Word reloc_offset) scope = _dl_loaded; definer = &symtab[ELF32_R_SYM (reloc->r_info)]; - loadbase = _dl_lookup_symbol (strtab + definer->st_name, &definer, scope); + loadbase = _dl_lookup_symbol (strtab + definer->st_name, &definer, + scope, l->l_name); /* Restore list frobnication done above for DT_SYMBOLIC. */ l->l_next = real_next; l->l_prev->l_next = l; /* Apply the relocation with that value. */ - elf_machine_rel (l->l_addr, l->l_info, reloc, loadbase, definer); + elf_machine_rel (l, reloc, loadbase, definer); /* The top of the stack is the word we set L from; but this location holds the address we will return to. Store there the address of a -- cgit v1.2.3