From a2b08ee54130cf3a74655856e6ca6c29874a9df2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 27 Sep 1997 00:21:42 +0000 Subject: Update. 1997-09-27 01:14 Ulrich Drepper * Makeconfig (extra-objs): Depend in before-compile. * configure.in: Locate Perl and substitute with complete path. * config.make.in: Add PERL for substitution. * elf/Makefile (routines): Add dl-addr. * elf/dladdr.c: Move the real code into ... * elf/dl-addr.c: New file. * elf/link.h: Add prototype for _dl_addr. * elf/dladdr.c (dladdr): Change address argument to be const. * elf/dlfcn.h: Likewise. * locale/C_name.c: Add _nl_POSIX_name. * locale/localeinfo.h: Add declaration of _nl_POSIX_name. * locale/findlocale.c (_nl_find_locale): Use _nl_POSIX_name. (_nl_remove_locale): Free name of data set. * locale/setlocale.c (clever_copy): Remove. (new_composite_name): Use _nl_C_name and _nl_POSIX_name in compare. (setname): Only remove old name when it is for category LC_ALL. Change malloc, free, realloc, and memalign hooks for glibc to take another parameter indicating the location of the caller. * malloc/malloc.c: Change hook functions and variables. * malloc/malloc.h: Likewise. * malloc/mcheck.c: Likewise. Make sure later hooked function also get the original caller address. * malloc/mtrace.c: Likewise. (tr_where): If no information in _mtrace_file is given use the information about the caller. * malloc/Makefile (distribute): Replace mtrace.awk by mtrace.pl. Add rules to install mtrace.pl after rewriting. * malloc/mtrace.pl: New file. Based on the old AWK script but with extended functionality. * malloc/mtrace.awk: Removed. * po/fr.po: New version. * string/Makefile: Do use builtins for tester.c and inl-tester.c. * string/tester.c: Rewrite. Split in many small functions to not exceed gcc's limits. * sysdeps/unix/sysv/linux/syscalls.list: Add prctl. 1997-09-25 Andreas Schwab * string/bits/string2.h (__stpcpy_small): Don't use casts as lvalues. 1997-09-26 Andreas Jaeger * manual/time.texi (Formatting Date and Time): Clarify explanation of strftime flags a bit. Suggested by Robert Bihlmeyer . 1997-09-25 00:13 David S. Miller * sysdeps/libm-ieee754/s_exp2f.c: Protect _GNU_SOURCE definition. Fix typo, it is FLT_MANT_DIG. 1997-09-24 18:52 H.J. Lu * math/atest-exp2.c: Include instead of . 1997-08-27 08:10 H.J. Lu * libio/libio.h, libio/libioP.h: Support libio in libstdc++. * libio/libio.h (_IO_peekc): Defined as _IO_peekc_unlocked if _IO_MTSAFE_IO is undefined. 1997-09-24 23:27 Richard Henderson * elf/dl-runtime.c (fixup): Don't go through elf_machine_relplt, but lookup the value of the target symbol ourselves and call the new elf_machine_fixup_plt. This kills the ELF_FIXUP_RETURN_VALUE hack. (profile_fixup): Likewise, but don't fix up the plt. * elf/rtld.c (_dl_main): ELF_MACHINE_RELOC_NOPLT renamed _JMP_SLOT. * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RELOC_NOPLT): Renamed. (elf_alpha_fix_plt): Renamed elf_machine_fixup_plt. * sysdeps/i386/dl-machine.h (elf_machine_relplt): Killed. (ELF_MACHINE_JMP_SLOT): Renamed. (elf_machine_fixup_plt): New function. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. (elf_machine_rela): Moved JMP_SLOT fixup out to elf_machine_fixup_plt. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/stub/dl-machine.h: Update, sorta. * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Do profiling. (TRAMPOLINE_TEMPLATE): From the carcas of _RUNTIME_TRAMPOLINE, do both normal and profile code. (elf_machine_rela): Handle r_addend for .got and .plt too. --- elf/dl-runtime.c | 174 +++++++++++++++++++++++++++---------------------------- 1 file changed, 85 insertions(+), 89 deletions(-) (limited to 'elf/dl-runtime.c') diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index e7132ed832..3f09d72c32 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -70,37 +70,16 @@ _dl_object_relocation_scope (struct link_map *l) #include "dynamic-link.h" -/* Figure out the right type, Rel or Rela. */ -#define elf_machine_rel 1 -#define elf_machine_rela 2 -#if elf_machine_relplt == elf_machine_rel -# define PLTREL ElfW(Rel) -#elif elf_machine_relplt == elf_machine_rela -# define PLTREL ElfW(Rela) +#if !defined ELF_MACHINE_NO_RELA || ELF_MACHINE_NO_REL +# define PLTREL ElfW(Rela) #else -# error "dl-machine.h bug: elf_machine_relplt not rel or rela" +# define PLTREL ElfW(Rel) #endif -#undef elf_machine_rel -#undef elf_machine_rela #ifndef VERSYMIDX # define VERSYMIDX(sym) (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (sym)) #endif -#ifndef ELF_FIXUP_RETURN_VALUE -#define ELF_FIXUP_RETURN_VALUE(map, result) (result) -#endif - -/* We need to define the function as a local symbol so that the reference - in the trampoline code will be a local PC-relative call. Tell the - compiler not to worry that the function appears not to be called. */ - -static ElfW(Addr) fixup ( -#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS - ELF_MACHINE_RUNTIME_FIXUP_ARGS, -#endif - struct link_map *l, ElfW(Word) reloc_offset) - __attribute__ ((unused)); /* This function is called through a special trampoline from the PLT the first time each PLT entry is called. We must perform the relocation @@ -109,7 +88,7 @@ static ElfW(Addr) fixup ( to that address. Future calls will bounce directly from the PLT to the function. */ -static ElfW(Addr) +static ElfW(Addr) __attribute__ ((unused)) fixup ( #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS ELF_MACHINE_RUNTIME_FIXUP_ARGS, @@ -124,57 +103,63 @@ fixup ( const PLTREL *const reloc = (const void *) (l->l_addr + l->l_info[DT_JMPREL]->d_un.d_ptr + reloc_offset); - ElfW(Addr) *const rel_addr = (ElfW(Addr) *)(l->l_addr + reloc->r_offset); + const ElfW(Sym) *sym = &symtab[ELFW(R_SYM) (reloc->r_info)]; + void *const rel_addr = (void *)(l->l_addr + reloc->r_offset); + ElfW(Addr) value; /* Set up the scope to find symbols referenced by this object. */ struct link_map **scope = _dl_object_relocation_scope (l); - { - const struct r_found_version *here_version; - - /* This macro is used as a callback from the elf_machine_relplt code. */ -#define RESOLVE(ref, version, flags) \ - ((version) != NULL && (version)->hash != 0 \ - ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name, (ref), scope, \ - l->l_name, (version), (flags)) \ - : _dl_lookup_symbol (strtab + (*ref)->st_name, (ref), scope, \ - l->l_name, (flags))) -#include "dynamic-link.h" + /* Sanity check that we're really looking at a PLT relocation. */ + assert (ELFW(R_TYPE)(reloc->r_info) == ELF_MACHINE_JMP_SLOT); - /* Perform the specified relocation. */ - if (l->l_info[VERSYMIDX (DT_VERSYM)]) + /* Look up the target symbol. */ + switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL) + { + default: { - const ElfW(Half) *version = - (const ElfW(Half) *) (l->l_addr + - l->l_info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr); - ElfW(Half) ndx = version[ELFW(R_SYM) (reloc->r_info)]; - - here_version = &l->l_versions[ndx]; + const ElfW(Half) *vernum = (const ElfW(Half) *) + (l->l_addr + l->l_info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr); + ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)]; + const struct r_found_version *version = &l->l_versions[ndx]; + + if (version->hash != 0) + { + value = _dl_lookup_versioned_symbol(strtab + sym->st_name, + &sym, scope, l->l_name, + version, ELF_MACHINE_JMP_SLOT); + break; + } } - else - here_version = NULL; + case 0: + value = _dl_lookup_symbol (strtab + sym->st_name, &sym, scope, + l->l_name, ELF_MACHINE_JMP_SLOT); + } + + /* Currently value contains the base load address of the object + that defines sym. Now add in the symbol offset. */ + value = (sym ? value + sym->st_value : 0); + + /* And now the relocation addend. */ +#ifndef ELF_MACHINE_NO_RELA + if (l->l_info[DT_PLTRELSZ]->d_un.d_val == sizeof (ElfW(Rela))) + value += reloc->r_addend; +#elif ELF_MACHINE_NO_REL + value += reloc->r_addend; +#endif - elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)], - here_version, (void *) rel_addr); - } + /* Finally, fix up the plt itself. */ + elf_machine_fixup_plt (l, reloc, rel_addr, value); *_dl_global_scope_end = NULL; - /* Return the address that was written by the relocation. */ - return ELF_FIXUP_RETURN_VALUE(l, *rel_addr); + return value; } #ifndef PROF -static ElfW(Addr) -profile_fixup ( -#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS - ELF_MACHINE_RUNTIME_FIXUP_ARGS, -#endif - struct link_map *l, ElfW(Word) reloc_offset, ElfW(Addr) retaddr) - __attribute__ ((unused)); -static ElfW(Addr) +static ElfW(Addr) __attribute__ ((unused)) profile_fixup ( #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS ELF_MACHINE_RUNTIME_FIXUP_ARGS, @@ -182,6 +167,7 @@ profile_fixup ( struct link_map *l, ElfW(Word) reloc_offset, ElfW(Addr) retaddr) { void (*mcount_fct) (ElfW(Addr), ElfW(Addr)) = _dl_mcount; + const ElfW(Sym) *const symtab = (const ElfW(Sym) *) (l->l_addr + l->l_info[DT_SYMTAB]->d_un.d_ptr); const char *strtab = @@ -190,47 +176,57 @@ profile_fixup ( const PLTREL *const reloc = (const void *) (l->l_addr + l->l_info[DT_JMPREL]->d_un.d_ptr + reloc_offset); - ElfW(Addr) result; + const ElfW(Sym) *sym = &symtab[ELFW(R_SYM) (reloc->r_info)]; + ElfW(Addr) value; /* Set up the scope to find symbols referenced by this object. */ struct link_map **scope = _dl_object_relocation_scope (l); - { - const struct r_found_version *here_version; + /* Sanity check that we're really looking at a PLT relocation. */ + assert (ELFW(R_TYPE)(reloc->r_info) == ELF_MACHINE_JMP_SLOT); - /* This macro is used as a callback from the elf_machine_relplt code. */ -#define RESOLVE(ref, version, flags) \ - ((version) != NULL && (version)->hash != 0 \ - ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name, (ref), scope, \ - l->l_name, (version), (flags)) \ - : _dl_lookup_symbol (strtab + (*ref)->st_name, (ref), scope, \ - l->l_name, (flags))) -#include "dynamic-link.h" - - /* Perform the specified relocation. */ - if (l->l_info[VERSYMIDX (DT_VERSYM)]) + /* Look up the target symbol. */ + switch (l->l_info[VERSYMIDX (DT_VERSYM)] != NULL) + { + default: { - const ElfW(Half) *version = - (const ElfW(Half) *) (l->l_addr + - l->l_info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr); - ElfW(Half) ndx = version[ELFW(R_SYM) (reloc->r_info)]; - - here_version = &l->l_versions[ndx]; + const ElfW(Half) *vernum = (const ElfW(Half) *) + (l->l_addr + l->l_info[VERSYMIDX (DT_VERSYM)]->d_un.d_ptr); + ElfW(Half) ndx = vernum[ELFW(R_SYM) (reloc->r_info)]; + const struct r_found_version *version = &l->l_versions[ndx]; + + if (version->hash != 0) + { + value = _dl_lookup_versioned_symbol(strtab + sym->st_name, + &sym, scope, l->l_name, + version, ELF_MACHINE_JMP_SLOT); + break; + } } - else - here_version = NULL; + case 0: + value = _dl_lookup_symbol (strtab + sym->st_name, &sym, scope, + l->l_name, ELF_MACHINE_JMP_SLOT); + } + + /* Currently value contains the base load address of the object + that defines sym. Now add in the symbol offset. */ + value = (sym ? value + sym->st_value : 0); - elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)], - here_version, (void *) &result); - } + /* And now the relocation addend. */ +#ifndef ELF_MACHINE_NO_RELA + if (l->l_info[DT_PLTRELSZ]->d_un.d_val == sizeof (ElfW(Rela))) + value += reloc->r_addend; +#elif ELF_MACHINE_NO_REL + value += reloc->r_addend; +#endif *_dl_global_scope_end = NULL; - (*mcount_fct) (retaddr, ELF_FIXUP_RETURN_VALUE (l, result)); + (*mcount_fct) (retaddr, value); - /* Return the address that was written by the relocation. */ - return ELF_FIXUP_RETURN_VALUE (l, result); + return value; } -#endif + +#endif /* PROF */ /* This macro is defined in dl-machine.h to define the entry point called -- cgit 1.4.1