mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 04:31:03 +00:00
be10a86854
Mon Feb 19 15:30:26 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> * stdio-common/tstscanf.c (main): Add check for "0" as %d. * sysdeps/stub/msync.c: Undo change of Jan 29; just two args. Only some systems have three args; let them define their own stub. * sysdeps/generic/dl-sysdep.c: Declare _dl_secure. * sysdeps/generic/machine-gmon.h: New file. * gmon/Makefile (distribute): Add machine-gmon.h. * gmon/mcount.c: Undo changes of Feb 13. Include "machine-gmon.h". Sun Feb 18 13:24:06 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/direct.h: File removed, since it is identical to unix/common/direct.h. * sysdeps/unix/Makefile [no_deps]: Don't include s-proto.d. * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Don't add ipc. * stdio-common/Makefile (tests): Remove scanf6. * sysdeps/unix/sysv/linux/Makefile (non-lib.a): Append libieee.a. * time/mktime.c (mktime): Move static variable localtime_offset to file scope. * stdio-common/vfscanf.c: Put '0' in buffer before scanning for %i base indicator. Thu Feb 15 16:56:17 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Corrected. (ELF_MACHINE_BEFORE_RTLD_RELOC): Define. (_dl_runtime_resolve): Save %a1 as well. (ELF_MACHINE_RUNTIME_FIXUP_ARGS): Add second dummy arg. (elf_machine_relplt): Define. * elf/dl-runtime.c: Include possible extra args in declaration of fixup.
109 lines
3.5 KiB
C
109 lines
3.5 KiB
C
/* On-demand PLT fixup for shared objects.
|
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
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. */
|
|
|
|
#include <link.h>
|
|
#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 Elf32_Rel
|
|
#elif elf_machine_relplt == elf_machine_rela
|
|
#define PLTREL Elf32_Rela
|
|
#else
|
|
#error "dl-machine.h bug: elf_machine_relplt not rel or rela"
|
|
#endif
|
|
#undef elf_machine_rel
|
|
#undef elf_machine_rela
|
|
|
|
/* 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 Elf32_Addr fixup (
|
|
#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
|
|
ELF_MACHINE_RUNTIME_FIXUP_ARGS,
|
|
#endif
|
|
struct link_map *l, Elf32_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
|
|
specified in the PLT of the given shared object, and return the resolved
|
|
function address to the trampoline, which will restart the original call
|
|
to that address. Future calls will bounce directly from the PLT to the
|
|
function. */
|
|
|
|
static Elf32_Addr
|
|
fixup (
|
|
#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
|
|
ELF_MACHINE_RUNTIME_FIXUP_ARGS,
|
|
#endif
|
|
struct link_map *l, Elf32_Word reloc_offset)
|
|
{
|
|
const Elf32_Sym *const symtab
|
|
= (const Elf32_Sym *) (l->l_addr + l->l_info[DT_SYMTAB]->d_un.d_ptr);
|
|
const char *strtab =
|
|
(const char *) (l->l_addr + l->l_info[DT_STRTAB]->d_un.d_ptr);
|
|
|
|
const PLTREL *const reloc
|
|
= (const void *) (l->l_addr + l->l_info[DT_JMPREL]->d_un.d_ptr +
|
|
reloc_offset);
|
|
|
|
const Elf32_Sym *definer;
|
|
Elf32_Addr loadbase;
|
|
struct link_map *scope, *real_next;
|
|
|
|
/* Look up the symbol's run-time value. */
|
|
|
|
real_next = l->l_next;
|
|
if (l->l_info[DT_SYMBOLIC])
|
|
{
|
|
l->l_next = _dl_loaded;
|
|
if (l->l_prev)
|
|
l->l_prev->l_next = real_next;
|
|
scope = l;
|
|
}
|
|
else
|
|
scope = _dl_loaded;
|
|
|
|
definer = &symtab[ELF32_R_SYM (reloc->r_info)];
|
|
loadbase = _dl_lookup_symbol (strtab + definer->st_name, &definer,
|
|
scope, l->l_name, 0);
|
|
|
|
/* Restore list frobnication done above for DT_SYMBOLIC. */
|
|
l->l_next = real_next;
|
|
if (l->l_prev)
|
|
l->l_prev->l_next = l;
|
|
|
|
/* Apply the relocation with that value. */
|
|
elf_machine_relplt (l, reloc, loadbase, definer);
|
|
|
|
return *(Elf32_Addr *) (l->l_addr + reloc->r_offset);
|
|
}
|
|
|
|
|
|
/* This macro is defined in dl-machine.h to define the entry point called
|
|
by the PLT. The `fixup' function above does the real work, but a little
|
|
more twiddling is needed to get the stack right and jump to the address
|
|
finally resolved. */
|
|
|
|
ELF_MACHINE_RUNTIME_TRAMPOLINE
|