mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
650425ceb4
1997-09-25 00:23 Ulrich Drepper <drepper@cygnus.com> * elf/dl-profile.c: Correct implementation. * io/ftwtest-sh: Don't depend on TMPDIR == /tmp. * locale/setlocale.c: Rewrite a bit for more clarity. * math/Makefile (libm-calls): Add w_exp2. * math/math_private.h: Add prototypes for __ieee754_exp2{,f,l}. * sysdeps/libm-i387/s_exp2.S: Change name to __ieee754_exp2. * sysdeps/libm-i387/s_exp2f.S: Likewise. * sysdeps/libm-i387/s_exp2l.S: Likewise. * sysdeps/libm-ieee754/k_standard.c: Add error cases for exp2. * string/bits/string2.h (__strcpy_small): Optimize. (__stpcpy_small): Likewise. (strncpy): Use variable for dest argument since it's used more than once. (strncat): Likewise. (strcmp): Add optimization for this function. * sysdeps/i386/i486/string.h (strlen): Correctly use __builtin_strlen. (__strcpy_small): Optimize. (__stpcpy_small): Likewise. (__stpcpy_c): Correctly use __mempcpy_* macros. (__mempcpy_by2, __mempcpy_by4, __mempcpy_byn): Return pointer to byte following last copied. (strncat): Use variable for dest argument since it's used more than once. (strcmp): Add optimization for this function. * sysdeps/i386/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Use .text and .previous to select correct section. 1997-09-23 19:56 Philip Blundell <Philip.Blundell@pobox.com> * configure.in: Add `--disable-versioning' option to suppress the use of symbol versions even if binutils claims to support it. 1997-09-24 20:10 Philip Blundell <Philip.Blundell@pobox.com> * csu/Makefile (before-compile): Don't try to build abi-tags.h if not using ELF. 1997-09-21 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/sofini.c [HAVE_DWARF2_UNWIND_INFO]: Supply termination for the frame unwind info section. * elf/soinit.c [HAVE_DWARF2_UNWIND_INFO]: Register and unregister the frame unwind info. * config.h.in (HAVE_DWARF2_UNWIND_INFO): Add #undef. * configure.in: Check whether gcc supports DWARF2 unwind info. * libc.map: Export frame handling tables. 1997-09-10 06:56 Geoff Keating <geoffk@ozemail.com.au> * sysdeps/unix/sysv/linux/powerpc/bits/kernel_termios.h: Use the size of the kernel's termios structure for ioctls. * sysdeps/powerpc/dl-machine.h: Prepare for library profiling. * sysdeps/powerpc/bits/mathinline.h: Add slightly slower versions of the C9X FP comparison macros. Delete 'fabs' and 'sqrt' inline routines, because gcc has them as internals. * sysdeps/powerpc/Makefile (pic-ccflags): Define this instead of CFLAGS-.os. * sysdeps/powerpc/bzero.S: New file. * sysdeps/powerpc/strcat.c: New file. * sysdeps/powerpc/strcpy.S: New file. * sysdeps/powerpc/stpcpy.S: New file. * math/Makefile: Add atest_exp2, test-reduce. * math/atest_exp2.c: New file. * math/test-reduce.c: New file. * sysdeps/libm-ieee754/Dist: New file. * sysdeps/libm-ieee754/s_exp2.c: New file. * sysdeps/libm-ieee754/s_exp2f.c: New file. * sysdeps/libm-ieee754/t_exp2.h: New file. * sysdeps/libm-ieee754/t_exp2f.h: New file. * math/libm-test.c (exp2_test): Add some more tests. * Rules: Use empty.os instead of empty.o, since it gets linked into libc.so... * configure.in: Add --disable-static to disable building .a files. * config.make.in: Substitute the new variable. * Makeconfig: Don't build .o files if not building .a files. * elf/dl-runtime.c (fixup): Factor out call to elf_machine_relplt. (profile_fixup): Likewise. 1997-09-23 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/globtest.c (main): Change to directory passed as first argument. * posix/globtest.sh: Don't cd before running the program, instead pass testdir as argument, so that $common_objpfx remains valid. 1997-09-23 18:01 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c (__do_niscall2): Fix multiple Server support. * nis/nis_findserver.c: Save latest working sockaddr_in. 1997-09-17 22:07 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Automatically determine whether as and ld are the GNU versions. (options): --with-gnu-{as,ld,binutils} replaced by single option --with-binutils=PATH specifying a -B option to gcc. * aclocal.m4: Two new macros defined, LIBC_PROG_FOO_GNU and LIBC_PROG_BINUTILS. * configure.in: Allow the user to force configuration for unsupported platforms with an undocumented option. 1997-09-22 16:55 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/get_myaddr.c (get_myaddress): Avoid loopback interfaces, return loopback address only if there is no other interface. * nis/Makefile: Add nis_callback libnsl-routines. * nis/nis_add.c: Use new __do_niscall* interface. * nis/nis_cache.c: Likewise. * nis/nis_checkpoint.c: Likewise. * nis/nis_lookup.c: Likewise. * nis/nis_mkdir.c: Likewise. * nis/nis_modify.c: Likewise. * nis/nis_ping.c: Likewise. * nis/nis_remove.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_server.c: Likewise. * nis/nis_util.c: Likewise. * nis/rpcsvc/nis.h: Make C++ safe. * nis/nss_nisplus/nisplus-publickey.c (getsecretkey): Fix use of variables. * nis/nis_findserv.c: Make thread safe. * nis/nis_call.c: Add support for callback, Fix use of variables. * nis/nis_table.c: Add support for callback, FOLLOW_PATH and ALL_RESULTS. * nis/nis_callback.c: New, callback functions. * nis/nis_intern.h: Add callback declarations. 1997-09-20 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/bits/string2.h: Fix logic in preprocessor directive. (__strsep_1c, __strsep_g): Don't declare __retval as pointing to const, to save a cast and a possible warning. 1997-09-22 04:12 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/i486/atomicity.h (exchange_and_add): Really address memory in xadd not %1. 1997-09-21 13:56 Ulrich Drepper <drepper@cygnus.com> * manual/maint.texi (Supported Configurations): Add SPARC64 to list of supported platforms.
242 lines
7.8 KiB
C
242 lines
7.8 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
|
||
|
||
#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
|
||
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);
|
||
ElfW(Addr) *const rel_addr = (ElfW(Addr) *)(l->l_addr + reloc->r_offset);
|
||
|
||
/* 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"
|
||
|
||
/* 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)];
|
||
|
||
here_version = &l->l_versions[ndx];
|
||
}
|
||
else
|
||
here_version = NULL;
|
||
|
||
elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)],
|
||
here_version, (void *) rel_addr);
|
||
}
|
||
|
||
*_dl_global_scope_end = NULL;
|
||
|
||
/* Return the address that was written by the relocation. */
|
||
return ELF_FIXUP_RETURN_VALUE(l, *rel_addr);
|
||
}
|
||
|
||
|
||
#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)
|
||
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);
|
||
|
||
{
|
||
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"
|
||
|
||
/* 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)];
|
||
|
||
here_version = &l->l_versions[ndx];
|
||
}
|
||
else
|
||
here_version = NULL;
|
||
|
||
elf_machine_relplt (l, reloc, &symtab[ELFW(R_SYM) (reloc->r_info)],
|
||
here_version, (void *) &result);
|
||
}
|
||
|
||
*_dl_global_scope_end = NULL;
|
||
(*mcount_fct) (retaddr, ELF_FIXUP_RETURN_VALUE (l, result));
|
||
|
||
/* Return the address that was written by the relocation. */
|
||
return ELF_FIXUP_RETURN_VALUE (l, result);
|
||
}
|
||
#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
|