From 6a5cac49b6eeb60abc891f9e28908da733766630 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 5 Feb 2018 14:58:39 -0800 Subject: Use ADDRIDX with DT_GNU_HASH The only differences in ld.so are line numbers for asserts. Reviewed-by: Jonathan Nieder * 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. --- elf/get-dynamic-info.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'elf/get-dynamic-info.h') diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h index d1bbd817be..4b1ea7c407 100644 --- 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); } -- cgit v1.2.3