mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
c0282c0642
2000-05-05 Ulrich Drepper <drepper@redhat.com> * elf/dl-load.c (_dl_map_object_from_fd): Little of computation of parameter to mprotect and for variable assignments. 2000-05-03 Jes Sorensen <jes@linuxcare.com> * sysdeps/generic/ldsodefs.h (LOOKUP_VALUE_ADDRESS): Check the validity of map before dereferencing it. * elf/dl-reloc.c (RESOLVE_MAP): Define. 2000-05-02 Jes Sorensen <jes@linuxcare.com> * elf/dl-runtime.c (fixup): Add the value returned in the symbol lookup to the arguments to elf_machine_fixup_plt(). * sysdeps/ia64/dl-machine.h (elf_machine_fixup_plt): Add Link_map of the symbol being resolved to input argument list and make the function return the pointer to the reloc. * sysdeps/alpha/dl-machine.h (elf_machine_fixup_plt): Change return valuie to lookup_t and return the value. * sysdeps/arm/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/generic/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_fixup_plt): Likewise. * sysdeps/powerpc/dl-machine.h (elf_machine_fixup_plt): Likewise. Make it an inline function returning value after calling __elf_machine_fixup_plt(). * elf/dl-sym.c (_dl_vsym): Use DL_SYMBOL_ADDRESS() to obtain the symbol address. * elf/dl-symbol.c (_dl_symbol_value): Use LOOKUP_VALUE_ADDRESS to obtain the symbol address. * sysdeps/generic/ldsodefs.h: Add generic DL_SYMBOL_ADDRESS() macro depending on the definition of ELF_FUNCTION_PTR_IS_SPECIAL. * sysdeps/ia64/dl-machine.h: Add DL_SYMBOL_ADDRESS() macro calling _dl_symbol_address() - this way DL_SYMBOL_ADDRESS() turns into an inline on non ia64. 2000-04-28 Jes Sorensen <jes@linuxcare.com> * elf/dl-runtime.c (fixup): Use the portable macros to get the symbol address of an object. * elf/dl-runtime.c (fixup-profile): Use the portable macros to get the symbol address of an object. * elf/dl-libc.c (struct do_dlsym_args): Change loadbase to a lookup_t. * elf/dl-lookup.c (_dl_lookup_symbol): Likewise. (_dl_lookup_symbol_skip): Likewise. (_dl_lookup_versioned_symbol): Likewise. (_dl_lookup_versioned_symbol_skip): Likewise. 2000-04-27 Jes Sorensen <jes@linuxcare.com> * elf/rtld.c (_dl_start): Get the function pointer return address via _dl_start_address for architectures that need a function pointer descriptor rather than just a pointer (ia64). * sysdeps/generic/dl-lookupcfg.h: New file. * sysdeps/ia64/dl-lookupcfg.h: New file. * sysdeps/ia64/dl-machine.h: New file. * sysdeps/ia64/dl-symaddr.c: New file. * sysdeps/ia64/dl-fptr.c: New file. * elf/elf.h: Add IA-64 specific definitions.
187 lines
4.6 KiB
C
187 lines
4.6 KiB
C
/* Unmap a loaded object. IA-64 version.
|
|
Copyright (C) 1999, 2000 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 <unistd.h>
|
|
#include <string.h>
|
|
#include <sys/param.h>
|
|
#include <sys/mman.h>
|
|
#include <link.h>
|
|
#include <ldsodefs.h>
|
|
#include <elf/dynamic-link.h>
|
|
#include <dl-machine.h>
|
|
#ifdef _LIBC_REENTRANT
|
|
# include <pt-machine.h>
|
|
|
|
static int __ia64_fptr_lock = 0;
|
|
#endif
|
|
|
|
/* Because ld.so is now versioned, these functions can be in their own
|
|
file; no relocations need to be done to call them. Of course, if
|
|
ld.so is not versioned... */
|
|
#if 0
|
|
#ifndef DO_VERSIONING
|
|
# error "This will not work with versioning turned off, sorry."
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef MAP_ANON
|
|
/* The fd is not examined when using MAP_ANON. */
|
|
#define ANONFD -1
|
|
#else
|
|
extern int _dl_zerofd;
|
|
#define ANONFD _dl_zerofd
|
|
#endif
|
|
|
|
|
|
/* ld.so currently has 14 FPTR relocs, we take 256 and use them for
|
|
the relocs for the dynamic app itself. */
|
|
struct ia64_fptr __boot_ldso_fptr[IA64_BOOT_FPTR_SIZE];
|
|
struct ia64_fptr *__fptr_root = NULL;
|
|
struct ia64_fptr *__fptr_next = __boot_ldso_fptr;
|
|
static struct ia64_fptr *__fptr_free = NULL;
|
|
int __fptr_count = IA64_BOOT_FPTR_SIZE;
|
|
|
|
Elf64_Addr
|
|
__ia64_make_fptr (const struct link_map *sym_map, Elf64_Addr value,
|
|
struct ia64_fptr **root, struct ia64_fptr *mem)
|
|
{
|
|
struct ia64_fptr **loc;
|
|
struct ia64_fptr *f;
|
|
|
|
#ifdef _LIBC_REENTRANT
|
|
/* Make sure we are alone. We don't need a lock during bootstrap. */
|
|
if (mem == NULL)
|
|
while (testandset (&__ia64_fptr_lock));
|
|
#endif
|
|
|
|
/* Search the sorted linked list for an existing entry for this
|
|
symbol. */
|
|
loc = root;
|
|
f = *loc;
|
|
while (f != NULL && f->func <= value)
|
|
{
|
|
if (f->func == value)
|
|
goto found;
|
|
loc = &f->next;
|
|
f = *loc;
|
|
}
|
|
|
|
/* Not found. Create a new one. */
|
|
if (mem != NULL)
|
|
f = mem;
|
|
else if (__fptr_free != NULL)
|
|
{
|
|
f = __fptr_free;
|
|
__fptr_free = f->next;
|
|
}
|
|
else
|
|
{
|
|
if (__fptr_count == 0)
|
|
{
|
|
#ifndef MAP_ANON
|
|
# define MAP_ANON 0
|
|
if (_dl_zerofd == -1)
|
|
{
|
|
_dl_zerofd = _dl_sysdep_open_zero_fill ();
|
|
if (_dl_zerofd == -1)
|
|
{
|
|
__close (fd);
|
|
_dl_signal_error (errno, NULL,
|
|
"cannot open zero fill device");
|
|
}
|
|
}
|
|
#endif
|
|
|
|
__fptr_next = __mmap (0, _dl_pagesize, PROT_READ | PROT_WRITE,
|
|
MAP_ANON | MAP_PRIVATE, ANONFD, 0);
|
|
if (__fptr_next == MAP_FAILED)
|
|
_dl_signal_error(errno, NULL, "cannot map page for fptr");
|
|
__fptr_count = _dl_pagesize / sizeof (struct ia64_fptr);
|
|
}
|
|
f = __fptr_next++;
|
|
__fptr_count--;
|
|
}
|
|
|
|
f->func = value;
|
|
/* GOT has already been relocated in elf_get_dynamic_info - don't
|
|
try to relocate it again. */
|
|
f->gp = sym_map->l_info[DT_PLTGOT]->d_un.d_ptr;
|
|
f->next = *loc;
|
|
*loc = f;
|
|
|
|
found:
|
|
#ifdef _LIBC_REENTRANT
|
|
/* Release the lock. */
|
|
if (mem == NULL)
|
|
__ia64_fptr_lock = 0;
|
|
#endif
|
|
|
|
return (Elf64_Addr) f;
|
|
}
|
|
|
|
void
|
|
_dl_unmap (struct link_map *map)
|
|
{
|
|
struct ia64_fptr **floc;
|
|
struct ia64_fptr *f;
|
|
struct ia64_fptr **lloc;
|
|
struct ia64_fptr *l;
|
|
|
|
__munmap ((void *) map->l_map_start, map->l_map_end - map->l_map_start);
|
|
|
|
#ifdef _LIBC_REENTRANT
|
|
/* Make sure we are alone. */
|
|
while (testandset (&__ia64_fptr_lock));
|
|
#endif
|
|
|
|
/* Search the sorted linked list for the first entry for this object. */
|
|
floc = &__fptr_root;
|
|
f = *floc;
|
|
while (f != NULL && f->func < map->l_map_start)
|
|
{
|
|
floc = &f->next;
|
|
f = *floc;
|
|
}
|
|
|
|
/* We found one. */
|
|
if (f != NULL && f->func < map->l_map_end)
|
|
{
|
|
/* Get the last entry. */
|
|
lloc = floc;
|
|
l = f;
|
|
while (l && l->func < map->l_map_end)
|
|
{
|
|
lloc = &l->next;
|
|
l = *lloc;
|
|
}
|
|
|
|
/* Updated FPTR. */
|
|
*floc = l;
|
|
|
|
/* Prepend them to the free list. */
|
|
*lloc = __fptr_free;
|
|
__fptr_free = f;
|
|
}
|
|
|
|
#ifdef _LIBC_REENTRANT
|
|
/* Release the lock. */
|
|
__ia64_fptr_lock = 0;
|
|
#endif
|
|
}
|