Update.

	* elf/dl-deps.c (_dl_map_object_deps): The sorting of the
	dependencies must be stable to work correctly.
	Reported by martin.lubich@datacon.at.

diff --git a/ChangeLog b/ChangeLog
index d7e9df2..49cad44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-04-02  Ulrich Drepper  <drepper@redhat.com>
 
+       * elf/dl-deps.c (_dl_map_object_deps): The sorting of the
+       dependencies must be stable to work correctly.
+       Reported by martin.lubich@datacon.at.
+
        * libio/bug-ungetwc1.c: New file.
        * libio/Makefile (tests): Add bug-ungetwc1.
 

diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 6dac54a..9fd2dd2 100644 (file)
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -614,6 +614,10 @@ Filters not supported with LD_TRACE_PRELINKING"));
                             (k - j) * sizeof (struct link_map *));
                    map->l_initfini[j] = here;
 
+                   /* Don't insert further matches before the last
+                      entry moved to the front.  */
+                   ++j;
+
                    break;
                  }
            }