summaryrefslogtreecommitdiff
path: root/elf/dl-reloc.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-04 23:23:40 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-04 23:23:40 +0000
commit736d0841e4aeee3013893e0aa095802f2c1de0d8 (patch)
tree0c187ead78325e45f5f1ff59dd75e34f86a9205c /elf/dl-reloc.c
parent3aaad0b63854cf780e2605b7c4f34170f8920957 (diff)
Update.
* elf/dl-runtime.c (fixup): Correct handling of symbols marked STV_HIDDEN and STV_INTERNAL during lookup. (profile_fixup): Likewise. * elf/dl-reloc.c (RESOLVE): Likewise.
Diffstat (limited to 'elf/dl-reloc.c')
-rw-r--r--elf/dl-reloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 8d180732d6..fa8e31b22c 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -71,7 +71,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
/* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code. */
#define RESOLVE(ref, version, flags) \
- (ELFW(ST_VISIBILITY) ((*ref)->st_other) != STV_PROTECTED \
+ (__builtin_expect (ELFW(ST_VISIBILITY) ((*ref)->st_other), 0) == 0 \
? ((version) != NULL && (version)->hash != 0 \
? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name, l, (ref), \
scope, (version), (flags)) \
@@ -134,7 +134,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
#ifdef CLEAR_CACHE
CLEAR_CACHE (mapstart, mapend);
-#endif
+#endif
}
}
}