aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-10-25 13:30:44 +0200
committerAndreas Schwab <schwab@redhat.com>2011-10-25 13:33:12 +0200
commit16437fece4208f299972a5f7e3fc04b2d4402334 (patch)
treeff461bbe8a21736f95c9fdce7a257c1f237f7bde
parent31d3cc00b0cc5205b4b4efd73c911cfddff444c6 (diff)
downloadglibc-16437fece4208f299972a5f7e3fc04b2d4402334.zip
glibc-16437fece4208f299972a5f7e3fc04b2d4402334.tar.gz
glibc-16437fece4208f299972a5f7e3fc04b2d4402334.tar.bz2
Small optimization of dependency sorting
-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 2383ec8..203c6ec 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 7fa4d69..95b1088 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 6df80ef..9fd913e 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