qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update MIPS dl-lookup.c.

This commit is contained in:
Joseph Myers 2009-12-16 17:44:03 +00:00
parent 4b8a7d2c3f
commit 872083bf15
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.mips
View File

@ -1,3 +1,7 @@
2009-12-16 Joseph Myers <joseph@codesourcery.com>
* sysdeps/mips/dl-lookup.c: Update from generic version.
2009-12-15 Joseph Myers <joseph@codesourcery.com> 2009-12-15 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Redefine O_SYNC and * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Redefine O_SYNC and

7
sysdeps/mips/dl-lookup.c
View File

@ -794,7 +794,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
if (__builtin_expect (protected != 0, 0)) if (__builtin_expect (protected != 0, 0))
{ {
/* It is very tricky. We need to figure out what value to /* It is very tricky. We need to figure out what value to
return for the protected symbol. */ return for the protected symbol. */
if (type_class == ELF_RTYPE_CLASS_PLT) if (type_class == ELF_RTYPE_CLASS_PLT)
{ {
if (current_value.s != NULL && current_value.m != undef_map) if (current_value.s != NULL && current_value.m != undef_map)
@ -839,7 +839,8 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
version, type_class, flags, skip_map); version, type_class, flags, skip_map);
/* The object is used. */ /* The object is used. */
current_value.m->l_used = 1; if (__builtin_expect (current_value.m->l_used == 0, 0))
current_value.m->l_used = 1;
if (__builtin_expect (GLRO(dl_debug_mask) if (__builtin_expect (GLRO(dl_debug_mask)
& (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0)) & (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0))
@ -861,7 +862,7 @@ _dl_setup_hash (struct link_map *map)
Elf_Symndx nchain; Elf_Symndx nchain;
if (__builtin_expect (map->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM if (__builtin_expect (map->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM
+ DT_THISPROCNUM + DT_VERSIONTAGNUM + DT_THISPROCNUM + DT_VERSIONTAGNUM
+ DT_EXTRANUM + DT_VALNUM] != NULL, 1)) + DT_EXTRANUM + DT_VALNUM] != NULL, 1))
{ {
Elf32_Word *hash32 Elf32_Word *hash32