about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChung-Lin Tang <cltang@codesourcery.com>2015-01-09 09:40:29 -0800
committerChung-Lin Tang <cltang@codesourcery.com>2015-01-09 09:40:29 -0800
commit585d9c182d34e96553f18ae357c46d2af4e57dee (patch)
tree5fdd0f3f3f77daceddb3ec1add2bd4533e69c1d7
parentaee6626c30dd0043990d9554c943fdfdbf9fce83 (diff)
downloadglibc-585d9c182d34e96553f18ae357c46d2af4e57dee.tar.gz
glibc-585d9c182d34e96553f18ae357c46d2af4e57dee.tar.xz
glibc-585d9c182d34e96553f18ae357c46d2af4e57dee.zip
Remove divide from _ELF_DYNAMIC_DO_RELOC in elf/dynamic-link.h.
-rw-r--r--ChangeLog5
-rw-r--r--elf/dynamic-link.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fa778d28fe..816616543c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-09  Chung-Lin Tang  <cltang@codesourcery.com>
+
+	* 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 <matthew.fortune@imgtec.com>
 
 	[BZ #17791]
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index a3eb1734bd..6f4a773d5a 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)) \