about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--elf/dl-deps.c2
-rw-r--r--elf/dl-fini.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2383ec8229..203c6ec90e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-25  Andreas Schwab  <schwab@redhat.com>
+
+	* elf/dl-deps.c (_dl_map_object_deps): Remove always true
+	condition.
+	* elf/dl-fini.c (_dl_sort_fini): Likewise.
+
 2011-10-25  Ulrich Drepper  <drepper@gmail.com>
 
 	* sysdeps/ieee754/dbl-64/branred.c: Move FMA4 code into separate
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 7fa4d691c3..95b1088f22 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -627,7 +627,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
       while (1)
 	{
 	  /* Keep track of which object we looked at this round.  */
-	  seen[i] += seen[i] < 2;
+	  ++seen[i];
 	  struct link_map *thisp = l_initfini[i];
 
 	  /* Find the last object in the list for which the current one is
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index 6df80ef78e..9fd913e0b7 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -44,7 +44,7 @@ _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, Lmid_t ns)
   while (1)
     {
       /* Keep track of which object we looked at this round.  */
-      seen[i] += seen[i] < 2;
+      ++seen[i];
       struct link_map *thisp = maps[i];
 
       /* Do not handle ld.so in secondary namespaces and object which