mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
bc9f6000f6
1997-03-23 02:11 Ulrich Drepper <drepper@cygnus.com> * time/sys/time.h: Make values ITIMER_* also available as macros. * elf/dl-support.c (_dl_sysdep_read_whole_file): Don't call __fstat but instead __fxstat directly to avoid dependency on libc.a when inline failed. * sysdeps/generic/dl-sysdep.c (_dl_sysdep_read_whole_file): Likewise. * math/Makefile (libm-routines): Add s_remquo. * sysdeps/libm-i387/s_remquo.S: New file. * sysdeps/libm-i387/s_remquof.S: New file. * sysdeps/libm-i387/s_remquol.S: New file. * sysdeps/libm-ieee754/s_remquo.c: New file. * sysdeps/libm-ieee754/s_remquof.c: New file. * sysdeps/libm-ieee754/s_remquol.c: New file. * math/libm-test.c (remquo_test): New function. * sysdeps/libm-ieee754/s_rintl.c: Handle implicit leading one correctly. 1997-03-22 14:06 Ulrich Drepper <drepper@cygnus.com> * math/Makefile (libm-calls): Add s_nan. * sysdeps/libm-ieee754/s_nan.c: New file. Implement `nan' function. * sysdeps/libm-ieee754/s_nanf.c: New file. Implement `nanf' function. * sysdeps/libm-ieee754/s_nanl.c: New file. Implement `nanl' function. * math/libm-test.c (basic_tests): Add tests for `nan' function. * math/libm-test.c (copysign_test): New function. (main): Call copysign_test. 1997-03-22 06:28 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-ieee754/s_nextafter.c: Return y if x == y. * sysdeps/libm-ieee754/s_nextafterf.c: Likewise. * sysdeps/libm-ieee754/s_nextafterl.c: Likewise. * sysdeps/libm-i387/s_nextafterl.c: Likewise. * math/libm-test.c (fdim_test, fmin_test, fmax_test, nextafter_test): New functions. Test these functions. (main): Call above new functions. 1997-03-22 04:53 Ulrich Drepper <drepper@cygnus.com> * Net release 2.0.2. 1997-03-22 04:37 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/termbits.h (OXTABS): Define as alias for XTABS. * sysdeps/unix/sysv/linux/alpha/termbits.h (OXTABS): Likewise. * termios/sys/ttydefaults.h: Partly revert patch by Andreas Schwab of Sun Dec 15 16:33:44 1996. Proposed by Thomas Bushnell <thomas@gnu.ai.mit.edu>. 1997-03-21 13:41 Roland McGrath <roland@baalperazim.frob.com> * sysdeps/sparc/dl-machine.h (elf_machine_rel): Rewritten as for i386. Check here for non-SHN_UNDEF STB_LOCAL symbols don't do any lookup or consult their values. (elf_machine_lookup_noexec_p, elf_machine_lookup_noplt_p, ELF_MACHINE_RELOC_NOPLT): New macros. * elf/rtld.c (dl_main): Pass ELF_MACHINE_RELOC_NOPLT to _dl_lookup_symbol in place of DL_LOOKUP_NOPLT. * sysdeps/i386/dl-machine.h (ELF_MACHINE_RELOC_NOPLT): New macro. * sysdeps/i386/dl-machine.h (elf_machine_rel): Rewritten to do the symbol lookup before checking reloc type except for R_386_RELATIVE. (elf_machine_lookup_noexec_p, elf_machine_lookup_noplt_p): New macros. * elf/dl-reloc.c (RESOLVE): Remove STB_LOCAL check; let it be per-machine since it supposedly can't happen on i386. * elf/dl-lookup.c (do_lookup): Change arg FLAGS to RELOC_TYPE. Use elf_machine_lookup_{noexec,noplt}_p macros on it. Remove gratuitous indirection from REF arg; change callers. (_dl_lookup_symbol, _dl_lookup_versioned_symbol): Change arg name. (_dl_lookup_symbol_skip, _dl_lookup_versioned_symbol_skip): Remove FLAGS arg altogether. * elf/dlsym.c: Remove argument of FLAGS parameter. * elf/dlvsym.c: Likewise. * elf/link.h: Update decls. * Makefile (distribute): Add BUGS.
353 lines
11 KiB
C
353 lines
11 KiB
C
/* Look up a symbol in the loaded 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 <stddef.h>
|
|
#include <link.h>
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
#include "dl-hash.h"
|
|
#include <dl-machine.h>
|
|
#include "../stdio-common/_itoa.h"
|
|
|
|
#define VERSTAG(tag) (DT_NUM + DT_PROCNUM + DT_VERSIONTAGIDX (tag))
|
|
|
|
struct sym_val
|
|
{
|
|
ElfW(Addr) a;
|
|
const ElfW(Sym) *s;
|
|
};
|
|
|
|
|
|
#define make_string(string, rest...) \
|
|
({ \
|
|
const char *all[] = { string, ## rest }; \
|
|
size_t len, cnt; \
|
|
char *result, *cp; \
|
|
\
|
|
len = 1; \
|
|
for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt) \
|
|
len += strlen (all[cnt]); \
|
|
\
|
|
cp = result = alloca (len); \
|
|
for (cnt = 0; cnt < sizeof (all) / sizeof (all[0]); ++cnt) \
|
|
cp = stpcpy (cp, all[cnt]); \
|
|
\
|
|
result; \
|
|
})
|
|
|
|
|
|
/* Inner part of the lookup functions. We return a value > 0 if we
|
|
found the symbol, the value 0 if nothing is found and < 0 if
|
|
something bad happened. */
|
|
static inline int
|
|
do_lookup (const char *undef_name, unsigned long int hash,
|
|
const ElfW(Sym) *ref, struct sym_val *result,
|
|
struct link_map *list[], size_t i, size_t n,
|
|
const char *reference_name, const struct r_found_version *version,
|
|
struct link_map *skip, int reloc_type)
|
|
{
|
|
struct link_map *map;
|
|
|
|
for (; i < n; ++i)
|
|
{
|
|
const ElfW(Sym) *symtab;
|
|
const char *strtab;
|
|
const ElfW(Half) *verstab;
|
|
ElfW(Symndx) symidx;
|
|
|
|
map = list[i];
|
|
|
|
/* Here come the extra test needed for `_dl_lookup_symbol_skip'. */
|
|
if (skip != NULL && map == skip)
|
|
continue;
|
|
|
|
/* Don't search the executable when resolving a copy reloc. */
|
|
if (elf_machine_lookup_noexec_p (reloc_type) &&
|
|
map->l_type == lt_executable)
|
|
continue;
|
|
|
|
symtab = ((void *) map->l_addr + map->l_info[DT_SYMTAB]->d_un.d_ptr);
|
|
strtab = ((void *) map->l_addr + map->l_info[DT_STRTAB]->d_un.d_ptr);
|
|
if (map->l_nversions > 0 && map->l_info[VERSTAG (DT_VERSYM)] != NULL)
|
|
verstab = ((void *) map->l_addr
|
|
+ map->l_info[VERSTAG (DT_VERSYM)]->d_un.d_ptr);
|
|
else
|
|
verstab = NULL;
|
|
|
|
/* Search the appropriate hash bucket in this object's symbol table
|
|
for a definition for the same symbol name. */
|
|
for (symidx = map->l_buckets[hash % map->l_nbuckets];
|
|
symidx != STN_UNDEF;
|
|
symidx = map->l_chain[symidx])
|
|
{
|
|
const ElfW(Sym) *sym = &symtab[symidx];
|
|
|
|
if (sym->st_value == 0 || /* No value. */
|
|
(elf_machine_lookup_noplt_p (reloc_type) /* Reject PLT entry. */
|
|
&& sym->st_shndx == SHN_UNDEF))
|
|
continue;
|
|
|
|
switch (ELFW(ST_TYPE) (sym->st_info))
|
|
{
|
|
case STT_NOTYPE:
|
|
case STT_FUNC:
|
|
case STT_OBJECT:
|
|
break;
|
|
default:
|
|
/* Not a code/data definition. */
|
|
continue;
|
|
}
|
|
|
|
if (sym != ref && strcmp (strtab + sym->st_name, undef_name))
|
|
/* Not the symbol we are looking for. */
|
|
continue;
|
|
|
|
if (version == NULL)
|
|
{
|
|
/* No specific version is selected. When the object
|
|
file also does not define a version we have a match.
|
|
Otherwise we only accept the default version, i.e.,
|
|
the version which name is "". */
|
|
if (verstab != NULL)
|
|
{
|
|
ElfW(Half) ndx = verstab[symidx] & 0x7fff;
|
|
if (map->l_versions[ndx].hash != 0)
|
|
continue;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (verstab == NULL)
|
|
{
|
|
/* We need a versioned system but haven't found any.
|
|
If this is the object which is referenced in the
|
|
verneed entry it is a bug in the library since a
|
|
symbol must not simply disappear. */
|
|
if (version->filename != NULL
|
|
&& _dl_name_match_p (version->filename, map))
|
|
return -1;
|
|
/* Otherwise we accept the symbol. */
|
|
}
|
|
else
|
|
{
|
|
/* We can match the version information. */
|
|
ElfW(Half) ndx = verstab[symidx] & 0x7fff;
|
|
if (map->l_versions[ndx].hash != version->hash
|
|
|| strcmp (map->l_versions[ndx].name, version->name))
|
|
/* It's not the version we want. */
|
|
continue;
|
|
}
|
|
}
|
|
|
|
switch (ELFW(ST_BIND) (sym->st_info))
|
|
{
|
|
case STB_GLOBAL:
|
|
/* Global definition. Just what we need. */
|
|
result->s = sym;
|
|
result->a = map->l_addr;
|
|
return 1;
|
|
case STB_WEAK:
|
|
/* Weak definition. Use this value if we don't find
|
|
another. */
|
|
if (! result->s)
|
|
{
|
|
result->s = sym;
|
|
result->a = map->l_addr;
|
|
}
|
|
break;
|
|
default:
|
|
/* Local symbols are ignored. */
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* If this current is the one mentioned in the verneed entry it
|
|
is a bug. */
|
|
if (version != NULL && version->filename != NULL
|
|
&& _dl_name_match_p (version->filename, map))
|
|
return -1;
|
|
}
|
|
|
|
/* We have not found anything until now. */
|
|
return 0;
|
|
}
|
|
|
|
/* Search loaded objects' symbol tables for a definition of the symbol
|
|
UNDEF_NAME. */
|
|
|
|
ElfW(Addr)
|
|
_dl_lookup_symbol (const char *undef_name, const ElfW(Sym) **ref,
|
|
struct link_map *symbol_scope[],
|
|
const char *reference_name,
|
|
int reloc_type)
|
|
{
|
|
const unsigned long int hash = _dl_elf_hash (undef_name);
|
|
struct sym_val current_value = { 0, NULL };
|
|
struct link_map **scope;
|
|
|
|
/* Search the relevant loaded objects for a definition. */
|
|
for (scope = symbol_scope; *scope; ++scope)
|
|
if (do_lookup (undef_name, hash, *ref, ¤t_value,
|
|
(*scope)->l_searchlist, 0, (*scope)->l_nsearchlist,
|
|
reference_name, NULL, NULL, reloc_type))
|
|
break;
|
|
|
|
if (current_value.s == NULL &&
|
|
(*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK))
|
|
/* We could find no value for a strong reference. */
|
|
_dl_signal_error (0, reference_name,
|
|
make_string ("undefined symbol: ", undef_name));
|
|
|
|
*ref = current_value.s;
|
|
return current_value.a;
|
|
}
|
|
|
|
|
|
/* This function is nearly the same as `_dl_lookup_symbol' but it
|
|
skips in the first list all objects until SKIP_MAP is found. I.e.,
|
|
it only considers objects which were loaded after the described
|
|
object. If there are more search lists the object described by
|
|
SKIP_MAP is only skipped. */
|
|
ElfW(Addr)
|
|
_dl_lookup_symbol_skip (const char *undef_name, const ElfW(Sym) **ref,
|
|
struct link_map *symbol_scope[],
|
|
const char *reference_name,
|
|
struct link_map *skip_map)
|
|
{
|
|
const unsigned long int hash = _dl_elf_hash (undef_name);
|
|
struct sym_val current_value = { 0, NULL };
|
|
struct link_map **scope;
|
|
size_t i;
|
|
|
|
/* Search the relevant loaded objects for a definition. */
|
|
scope = symbol_scope;
|
|
for (i = 0; (*scope)->l_dupsearchlist[i] != skip_map; ++i)
|
|
assert (i < (*scope)->l_ndupsearchlist);
|
|
|
|
if (! do_lookup (undef_name, hash, *ref, ¤t_value,
|
|
(*scope)->l_dupsearchlist, i, (*scope)->l_ndupsearchlist,
|
|
reference_name, NULL, skip_map, 0))
|
|
while (*++scope)
|
|
if (do_lookup (undef_name, hash, *ref, ¤t_value,
|
|
(*scope)->l_dupsearchlist, 0, (*scope)->l_ndupsearchlist,
|
|
reference_name, NULL, skip_map, 0))
|
|
break;
|
|
|
|
*ref = current_value.s;
|
|
return current_value.a;
|
|
}
|
|
|
|
|
|
/* This function works like _dl_lookup_symbol but it takes an
|
|
additional arguement with the version number of the requested
|
|
symbol.
|
|
|
|
XXX We'll see whether we need this separate function. */
|
|
ElfW(Addr)
|
|
_dl_lookup_versioned_symbol (const char *undef_name, const ElfW(Sym) **ref,
|
|
struct link_map *symbol_scope[],
|
|
const char *reference_name,
|
|
const struct r_found_version *version,
|
|
int reloc_type)
|
|
{
|
|
const unsigned long int hash = _dl_elf_hash (undef_name);
|
|
struct sym_val current_value = { 0, NULL };
|
|
struct link_map **scope;
|
|
|
|
/* Search the relevant loaded objects for a definition. */
|
|
for (scope = symbol_scope; *scope; ++scope)
|
|
{
|
|
int res = do_lookup (undef_name, hash, *ref, ¤t_value,
|
|
(*scope)->l_searchlist, 0, (*scope)->l_nsearchlist,
|
|
reference_name, version, NULL, reloc_type);
|
|
if (res > 0)
|
|
break;
|
|
|
|
if (res < 0)
|
|
/* Oh, oh. The file named in the relocation entry does not
|
|
contain the needed symbol. */
|
|
_dl_signal_error (0, *reference_name ? reference_name : NULL,
|
|
make_string ("symbol ", undef_name, ", version ",
|
|
version->name,
|
|
" not defined in file ",
|
|
version->filename,
|
|
" with link time reference"));
|
|
}
|
|
|
|
if (current_value.s == NULL &&
|
|
(*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK))
|
|
/* We could find no value for a strong reference. */
|
|
_dl_signal_error (0, reference_name,
|
|
make_string ("undefined symbol: ", undef_name,
|
|
", version ", version->name ?: NULL));
|
|
|
|
*ref = current_value.s;
|
|
return current_value.a;
|
|
}
|
|
|
|
|
|
/* Similar to _dl_lookup_symbol_skip but takes an additional argument
|
|
with the version we are looking for. */
|
|
ElfW(Addr)
|
|
_dl_lookup_versioned_symbol_skip (const char *undef_name,
|
|
const ElfW(Sym) **ref,
|
|
struct link_map *symbol_scope[],
|
|
const char *reference_name,
|
|
const struct r_found_version *version,
|
|
struct link_map *skip_map)
|
|
{
|
|
const unsigned long int hash = _dl_elf_hash (undef_name);
|
|
struct sym_val current_value = { 0, NULL };
|
|
struct link_map **scope;
|
|
size_t i;
|
|
|
|
/* Search the relevant loaded objects for a definition. */
|
|
scope = symbol_scope;
|
|
for (i = 0; (*scope)->l_dupsearchlist[i] != skip_map; ++i)
|
|
assert (i < (*scope)->l_ndupsearchlist);
|
|
|
|
if (! do_lookup (undef_name, hash, *ref, ¤t_value,
|
|
(*scope)->l_dupsearchlist, i, (*scope)->l_ndupsearchlist,
|
|
reference_name, version, skip_map, 0))
|
|
while (*++scope)
|
|
if (do_lookup (undef_name, hash, *ref, ¤t_value,
|
|
(*scope)->l_dupsearchlist, 0, (*scope)->l_ndupsearchlist,
|
|
reference_name, version, skip_map, 0))
|
|
break;
|
|
|
|
*ref = current_value.s;
|
|
return current_value.a;
|
|
}
|
|
|
|
|
|
/* Cache the location of MAP's hash table. */
|
|
|
|
void
|
|
_dl_setup_hash (struct link_map *map)
|
|
{
|
|
ElfW(Symndx) *hash = (void *)(map->l_addr + map->l_info[DT_HASH]->d_un.d_ptr);
|
|
ElfW(Symndx) nchain;
|
|
map->l_nbuckets = *hash++;
|
|
nchain = *hash++;
|
|
map->l_buckets = hash;
|
|
hash += map->l_nbuckets;
|
|
map->l_chain = hash;
|
|
}
|