diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 16:50:31 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 16:50:31 +0000 |
| commit | c86ab84d63b20aff7cf391414009a38477fe7137 (patch) | |
| tree | eb92a78a0fd85b83317300f94a1dbed8ca414fb9 /libc/elf | |
| parent | 4bbe4e2185c5484328182720ff7b3bb4f9593bff (diff) | |
Merge changes between r15532 and r15557 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15558 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/elf')
| -rw-r--r-- | libc/elf/dl-deps.c | 2 | ||||
| -rw-r--r-- | libc/elf/dl-fini.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/elf/dl-deps.c b/libc/elf/dl-deps.c index 326fc16a5..fb180ac99 100644 --- a/libc/elf/dl-deps.c +++ b/libc/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/libc/elf/dl-fini.c b/libc/elf/dl-fini.c index 953849d92..d10d89f40 100644 --- a/libc/elf/dl-fini.c +++ b/libc/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 |