Small optimization of dependency sorting

diff --git a/ChangeLog b/ChangeLog
index 2383ec8229c5c6fe376b8ef7e1edc68ad5f240b5..203c6ec90ed457816484bd19ceb63726576dfcb3 100644 (file)
--- 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 7fa4d691c37e7327288663977173d2388ead1d33..95b1088f22eb43fb267bce95dd015720012d38c5 100644 (file)
--- 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 6df80ef78e02e464416df0f9810fbf729fbe3797..9fd913e0b76cc77e03a2043e2006e7e50cb41d02 100644 (file)
--- 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