From: Chung-Lin Tang Date: Fri, 9 Jan 2015 17:40:29 +0000 (-0800) Subject: Remove divide from _ELF_DYNAMIC_DO_RELOC in elf/dynamic-link.h. X-Git-Tag: glibc-2.21~66 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585d9c182d34e96553f18ae357c46d2af4e57dee;p=thirdparty%2Fglibc.git Remove divide from _ELF_DYNAMIC_DO_RELOC in elf/dynamic-link.h. --- diff --git a/ChangeLog b/ChangeLog index fa778d28fec..816616543ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-01-09 Chung-Lin Tang + + * elf/dynamic-link.h (_ELF_DYNAMIC_DO_RELOC): Remove MIN() and + assign raw DT_REL[A]COUNT value to ranges[0].nrelative. + 2015-01-09 Matthew Fortune [BZ #17791] diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h index a3eb1734bdc..6f4a773d5a2 100644 --- a/elf/dynamic-link.h +++ b/elf/dynamic-link.h @@ -122,8 +122,7 @@ elf_machine_lazy_rel (struct link_map *map, ranges[0].size = (map)->l_info[DT_##RELOC##SZ]->d_un.d_val; \ if (map->l_info[VERSYMIDX (DT_##RELOC##COUNT)] != NULL) \ ranges[0].nrelative \ - = MIN (map->l_info[VERSYMIDX (DT_##RELOC##COUNT)]->d_un.d_val, \ - ranges[0].size / sizeof (ElfW(reloc))); \ + = map->l_info[VERSYMIDX (DT_##RELOC##COUNT)]->d_un.d_val; \ } \ if ((map)->l_info[DT_PLTREL] \ && (!test_rel || (map)->l_info[DT_PLTREL]->d_un.d_val == DT_##RELOC)) \