about summary refs log tree commit diff
path: root/elf/dl-addr.c
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-02-05 14:58:39 -0800
committerH.J. Lu <hjl.tools@gmail.com>2018-02-05 14:58:57 -0800
commit6a5cac49b6eeb60abc891f9e28908da733766630 (patch)
tree19a0e8045c6c664667860a8e1e269e7b5f536e22 /elf/dl-addr.c
parentb44e0dfbacecd0f84ebfa942e6d6c0153981680e (diff)
downloadglibc-6a5cac49b6eeb60abc891f9e28908da733766630.tar.gz
glibc-6a5cac49b6eeb60abc891f9e28908da733766630.tar.xz
glibc-6a5cac49b6eeb60abc891f9e28908da733766630.zip
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.
Diffstat (limited to 'elf/dl-addr.c')
-rw-r--r--elf/dl-addr.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/elf/dl-addr.c b/elf/dl-addr.c
index 60073dcee6..2250617a73 100644
--- 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.  */