diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-16 13:04:18 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-16 13:04:18 +0200 |
| commit | 8a598439b93552cb666ab3cf63a5ff8aabd06260 (patch) | |
| tree | 50934cb3f9879206cc36e9c80516ef7eb956719c /elf | |
| parent | c38262349f9ad25d708e47a6715e94d87aa924ce (diff) | |
| parent | 837dea7cf54827d6e43d88a9463bcc10d30472d0 (diff) | |
| download | glibc-8a598439b93552cb666ab3cf63a5ff8aabd06260.tar glibc-8a598439b93552cb666ab3cf63a5ff8aabd06260.tar.gz glibc-8a598439b93552cb666ab3cf63a5ff8aabd06260.tar.bz2 glibc-8a598439b93552cb666ab3cf63a5ff8aabd06260.zip | |
Merge branch 'master' of sourceware.org:/git/glibc into fedora/master
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-lookup.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 92dc7b226a..707d650719 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -1,5 +1,5 @@ /* Look up a symbol in the loaded objects. - Copyright (C) 1995-2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1995-2005, 2006, 2007, 2009 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 @@ -542,15 +542,20 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map, conflict = 1; } - if (value->s - && (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info) - == STT_TLS, 0))) - type_class = 4; + if (value->s) + { + if (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info) + == STT_TLS, 0)) + type_class = 4; + else if (__builtin_expect (ELFW(ST_TYPE) (value->s->st_info) + == STT_GNU_IFUNC, 0)) + type_class |= 8; + } if (conflict || GLRO(dl_trace_prelink_map) == undef_map || GLRO(dl_trace_prelink_map) == NULL - || type_class == 4) + || type_class >= 4) { _dl_printf ("%s 0x%0*Zx 0x%0*Zx -> 0x%0*Zx 0x%0*Zx ", conflict ? "conflict" : "lookup", |