3996f34b46
1997-07-28 23:35 Ulrich Drepper <drepper@cygnus.com> * csu/gmon-start.c (__gmon_start__): Call __monstartup not monstartup. * gmon/gmon.c: Rename moncontrol to __moncontrol and monstartup to __monstartup. * gmon/sys/gmon.h: Fix prototypes. * gmon/sys/gmon_out.h: Pretty print. * gmon/bb_exit_func.c (__bb_exit_func): Use memcpy instead of bcopy. * gmon/gmon.c (__monstartup): Likewise. (write_hist): Remove dependency on 32 int. (_mcleanup): Don't call perror, use fprintf. * elf/dl-load.c: Fix handling of current directory in search path. * elf/Makefile (dl-routines): Add dl-profile. * elf/dl-profile.c: New file. * elf/dl-runtime.c (fixup): Add new parameter with address to store relocation result in to elf_machine_relplt. (profile_fixup): New function. * elf/do-rel.h (elf_dynamic_do_rel): Add new parameter with address to store relocation result in to elf_machine_relplt. * elf/dl-support.c: Define _dl_profile and _dl_profile_map. * elf/dynamic-link.h (ELF_DYNAMIC_RELOCATE): Add new parameter and call elf_machine_runtime_setup with extra argument. * elf/dl-reloc.c (_dl_relocate_object): Add new argument to ELF_DYNAMIC_RELOCATE. * elf/link.h: Add prototypes for new functions and variables. * elf/rtld.c: Parse LD_PROFILE and LD_PROFILE_OUTPUT environment variables and call _dl_start_profile if necessary. * include/sys/gmon_out.h: New file. * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Add new parameter to enable profiling. (elf_machine_rela): Add new parameter to specify place to store result in. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * sysdeps/mips/mips64/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. * sysdeps/sparc/dl-machine.h: Likewise. * sysdeps/sparc64/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. (elf_machine_runtime_setup): Setup got[2] to _dl_runtime_resolve if we do profiling. (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add code for _dl_runtime_profile. * nis/nss_compat/compat-grp.c (internal_setgrent): Set FD_CLOEXEC for stream on input file. * nis/nss_compat/compat-pwd.c (internal_setpwent): Likewise. * nis/nss_compat/compat-spwd.c (internal_setspent): Likewise. * nss/nss_db/db-XXX.c (internal_setent): Likewise. * nss/nss_db/db-alias.c (internal_setent): Likewise. * nss/nss_db/db-netgrp.c (internal_setent): Likewise. * nss/nss_files/files-XXX.c (internal_setent): Likewise. * nss/nss_files/files-alias.c (internal_setent): Likewise. * nss/nss_files/files-netgrp.c (internal_setent): Likewise. * string/string.h: Pretty print. * sysdeps/i386/fpu/bits/mathinline.h: Major update by John Bowman. Add float and long double versions. 1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/rtld.c (print_unresolved): Replace empty object name by main program name. 1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/htons.c (htons): Renamed from __htons. 1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/bits/byteswap.h: New file. 1997-07-27 23:50 Philip Blundell <Philip.Blundell@pobox.com> * inet/netinet/icmp6.h: Update for new drafts of POSIX.1g and IPv6 advanced API. * inet/netinet/in.h: Likewise. * inet/netinet/ip6.h: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * posix/sys/types.h: Add socklen_t. * manual/socket.texi: Document some more IPv6 things. * manual/libc.texinfo: Likewise. 1997-07-26 Andreas Jaeger <aj@arthur.rhein-neckar.de> * libc.map: Define missing symbol. 1997-07-27 14:31 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/Makefile: Add nis_findserv. * nis/lckcache.c: Fix typo. * nis/nis_call.c: Fix problems with multihomed servers. * nis/nis_findserv.c: New file. * nis/nis_intern.h: Add more prototypes. * nis/nis_lookup.c (nis_lookup): Don't try the next server if network is unreachable. * nis/nis_table.c (nis_list): Likewise. * nis/nis_ping.c (nis_ping): Use MASTER_ONLY, don't call abort() in error case. * nis/nis_util.c (__nis_finddirectory): Give the right error code back. * nis/ypclnt.c: Make sure, that all sockets are closed.
235 lines
7.7 KiB
C
235 lines
7.7 KiB
C
/* On-demand PLT fixup for shared objects.
|
||
Copyright (C) 1995, 1996, 1997 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., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
#include <link.h>
|
||
#include <stddef.h>
|
||
|
||
|
||
/* The global scope we will use for symbol lookups.
|
||
This will be modified by _dl_open if RTLD_GLOBAL is used. */
|
||
struct link_map **_dl_global_scope = _dl_default_scope;
|
||
struct link_map **_dl_global_scope_end = &_dl_default_scope[3];
|
||
|
||
|
||
/* Hack _dl_global_scope[0] and [1] as necessary, and return a pointer into
|
||
_dl_global_scope that should be passed to _dl_lookup_symbol for symbol
|
||
references made in the object L's relocations. */
|
||
inline struct link_map **
|
||
_dl_object_relocation_scope (struct link_map *l)
|
||
{
|
||
if (l->l_info[DT_SYMBOLIC])
|
||
{
|
||
/* This object's global references are to be resolved first
|
||
in the object itself, and only secondarily in more global
|
||
scopes. */
|
||
|
||
if (! l->l_searchlist)
|
||
/* We must construct the searchlist for this object. */
|
||
_dl_map_object_deps (l, NULL, 0, 0);
|
||
|
||
/* The primary scope is this object itself and its
|
||
dependencies. */
|
||
_dl_global_scope[0] = l;
|
||
|
||
/* Secondary is the dependency tree that reached L; the object
|
||
requested directly by the user is at the root of that tree. */
|
||
while (l->l_loader)
|
||
l = l->l_loader;
|
||
_dl_global_scope[1] = l;
|
||
|
||
/* Finally, the global scope follows. */
|
||
|
||
return _dl_global_scope;
|
||
}
|
||
else
|
||
{
|
||
/* Use first the global scope, and then the scope of the root of the
|
||
dependency tree that first caused this object to be loaded. */
|
||
while (l->l_loader)
|
||
l = l->l_loader;
|
||
*_dl_global_scope_end = l;
|
||
return &_dl_global_scope[2];
|
||
}
|
||
}
|
||
|
||
#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)
|
||
#else
|
||
# error "dl-machine.h bug: elf_machine_relplt not rel or rela"
|
||
#endif
|
||
#undef elf_machine_rel
|
||
#undef elf_machine_rela
|
||
|
||
#ifndef VERSYMIDX
|
||
# define VERSYMIDX(sym) (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (sym))
|
||
#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
|
||
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 ElfW(Addr)
|
||
fixup (
|
||
#ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS
|
||
ELF_MACHINE_RUNTIME_FIXUP_ARGS,
|
||
#endif
|
||
struct link_map *l, ElfW(Word) reloc_offset)
|
||
{
|
||
const ElfW(Sym) *const symtab
|
||
= (const ElfW(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);
|
||
|
||
/* Set up the scope to find symbols referenced by this object. */
|
||
struct link_map **scope = _dl_object_relocation_scope (l);
|
||
|
||
{
|
||
/* 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)])
|
||
{
|
||
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)];
|
||
|
||
elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)],
|
||
&l->l_versions[ndx],
|
||
(void *) (l->l_addr + reloc->r_offset));
|
||
}
|
||
else
|
||
elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)],
|
||
NULL, (void *) (l->l_addr + reloc->r_offset));
|
||
}
|
||
|
||
*_dl_global_scope_end = NULL;
|
||
|
||
/* Return the address that was written by the relocation. */
|
||
#ifdef ELF_FIXUP_RETURNS_ADDRESS
|
||
return (ElfW(Addr))(l->l_addr + reloc->r_offset);
|
||
#else
|
||
return *(ElfW(Addr) *) (l->l_addr + reloc->r_offset);
|
||
#endif
|
||
}
|
||
|
||
|
||
#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)
|
||
{
|
||
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 =
|
||
(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);
|
||
ElfW(Addr) result;
|
||
|
||
/* Set up the scope to find symbols referenced by this object. */
|
||
struct link_map **scope = _dl_object_relocation_scope (l);
|
||
|
||
{
|
||
/* 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)])
|
||
{
|
||
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)];
|
||
|
||
elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)],
|
||
&l->l_versions[ndx], (void *) &result);
|
||
}
|
||
else
|
||
elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)],
|
||
NULL, (void *) &result);
|
||
}
|
||
|
||
*_dl_global_scope_end = NULL;
|
||
|
||
/* Return the address that was written by the relocation. */
|
||
#ifdef ELF_FIXUP_RETURNS_ADDRESS
|
||
(*mcount_fct) (retaddr, result);
|
||
|
||
return &result; /* XXX This cannot work. What to do??? --drepper */
|
||
#else
|
||
(*mcount_fct) (retaddr, result);
|
||
|
||
return result;
|
||
#endif
|
||
}
|
||
#endif
|
||
|
||
|
||
/* 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
|