diff options
Diffstat (limited to 'elf/dl-deps.c')
| -rw-r--r-- | elf/dl-deps.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c index b5a43232a7..7a8d8ce988 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -611,7 +611,12 @@ Filters not supported with LD_TRACE_PRELINKING")); memcpy (l_initfini, map->l_searchlist.r_list, nlist * sizeof (struct link_map *)); - _dl_sort_maps (&l_initfini[1], nlist - 1, NULL, false); + /* If libc.so.6 is the main map, it participates in the sort, so + that the relocation order is correct regarding libc.so.6. */ + if (l_initfini[0] == GL (dl_ns)[l_initfini[0]->l_ns].libc_map) + _dl_sort_maps (l_initfini, nlist, NULL, false); + else + _dl_sort_maps (&l_initfini[1], nlist - 1, NULL, false); /* Terminate the list of dependencies. */ l_initfini[nlist] = NULL; |