Use ADDRIDX with DT_GNU_HASH

The only differences in ld.so are line numbers for asserts.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
	* elf/dl-addr.c (determine_info): Use ADDRIDX with DT_GNU_HASH.
	* elf/dl-lookup.c (_dl_setup_hash): Likewise.
	* elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0509306521462f6ab3e5dd58106690f3f846984f..8c934b9cf56d57408b5972a5b9096894bf6cfca1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf/dl-addr.c (determine_info): Use ADDRIDX with DT_GNU_HASH.
+       * elf/dl-lookup.c (_dl_setup_hash): Likewise.
+       * elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise.
+
 2018-02-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elf/elf.h (DT_SYMTAB_SHNDX): New.  Set to 34.

diff --git a/elf/dl-addr.c b/elf/dl-addr.c
index 60073dcee60e5889251657f918910ff65614eb57..2250617a730994730b3d166012d334bef48dc1db 100644 (file)
--- a/elf/dl-addr.c
+++ b/elf/dl-addr.c
@@ -42,8 +42,7 @@ determine_info (const ElfW(Addr) addr, struct link_map *match, Dl_info *info,
   ElfW(Word) strtabsize = match->l_info[DT_STRSZ]->d_un.d_val;
 
   const ElfW(Sym) *matchsym = NULL;
-  if (match->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM + DT_THISPROCNUM
-                   + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] != NULL)
+  if (match->l_info[ADDRIDX (DT_GNU_HASH)] != NULL)
     {
       /* We look at all symbol table entries referenced by the hash
         table.  */

diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 41dced0e19c04849117630ee994a1b6f39c7115b..401bc87c900cbad076a5b2dcc35e39c699f10ae1 100644 (file)
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -936,14 +936,10 @@ _dl_setup_hash (struct link_map *map)
 {
   Elf_Symndx *hash;
 
-  if (__glibc_likely (map->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM
-                                   + DT_THISPROCNUM + DT_VERSIONTAGNUM
-                                   + DT_EXTRANUM + DT_VALNUM] != NULL))
+  if (__glibc_likely (map->l_info[ADDRIDX (DT_GNU_HASH)] != NULL))
     {
       Elf32_Word *hash32
-       = (void *) D_PTR (map, l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM
-                                     + DT_THISPROCNUM + DT_VERSIONTAGNUM
-                                     + DT_EXTRANUM + DT_VALNUM]);
+       = (void *) D_PTR (map, l_info[ADDRIDX (DT_GNU_HASH)]);
       map->l_nbuckets = *hash32++;
       Elf32_Word symbias = *hash32++;
       Elf32_Word bitmask_nwords = *hash32++;

diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index d1bbd817be68a68a32b223d1d5943222f83bed03..4b1ea7c4078ee94774f7a165f732bdc22fdca6ca 100644 (file)
--- a/elf/get-dynamic-info.h
+++ b/elf/get-dynamic-info.h
@@ -110,8 +110,7 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
 # endif
       ADJUST_DYN_INFO (DT_JMPREL);
       ADJUST_DYN_INFO (VERSYMIDX (DT_VERSYM));
-      ADJUST_DYN_INFO (DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM + DT_THISPROCNUM
-                      + DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM);
+      ADJUST_DYN_INFO (ADDRIDX (DT_GNU_HASH));
 # undef ADJUST_DYN_INFO
       assert (cnt <= DL_RO_DYN_TEMP_CNT);
     }