qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle DSOs without any dependency in ld.so

This commit is contained in:
Ulrich Drepper 2011-05-30 12:31:25 -04:00
parent 4997db7429
commit 6b1e7d1992
5 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2011-05-30 Ulrich Drepper <drepper@gmail.com> 2011-05-30 Ulrich Drepper <drepper@gmail.com>
[BZ #12454]
* elf/dl-deps.c (_dl_map_object_deps): Run initializer sorting only
when there are multiple maps.
* elf/dl-fini.c (_dl_sort_fini): Check for list of one.
(_dl_fini): Remove test here.
* elf/rtld.c (dl_main): Don't allow the loader to load itself. * elf/rtld.c (dl_main): Don't allow the loader to load itself.
2011-05-29 Ulrich Drepper <drepper@gmail.com> 2011-05-29 Ulrich Drepper <drepper@gmail.com>

4
NEWS
View File

@ -1,4 +1,4 @@
GNU C Library NEWS -- history of user-visible changes. 2011-5-29 GNU C Library NEWS -- history of user-visible changes. 2011-5-30
Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc. Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
See the end for copying conditions. See the end for copying conditions.
@ -23,7 +23,7 @@ Version 2.14
* The RPC implementation in libc is obsoleted. Old programs keep working * The RPC implementation in libc is obsoleted. Old programs keep working
but new programs cannot be linked with the routines in libc anymore. but new programs cannot be linked with the routines in libc anymore.
Programs in need of RPC functionality must be linked against TI-RPC. Programs in need of RPC functionality must be linked against TI-RPC.
The TI-RPC implemtation is IPv6 enabled and there are other benefits. The TI-RPC implementation is IPv6 enabled and there are other benefits.
Visible changes of this change include (obviously) the inability to link Visible changes of this change include (obviously) the inability to link
programs using RPC functions without referencing the TI-RPC library and the programs using RPC functions without referencing the TI-RPC library and the

11
elf/dl-deps.c
View File

@ -617,13 +617,14 @@ Filters not supported with LD_TRACE_PRELINKING"));
map->l_searchlist.r_list[i]->l_reserved = 0; map->l_searchlist.r_list[i]->l_reserved = 0;
} }
/* Now determine the order in which the initialization has to happen. */ /* Sort the initializer list to take dependencies into account. The binary
itself will always be initialize last. */
memcpy (l_initfini, map->l_searchlist.r_list, memcpy (l_initfini, map->l_searchlist.r_list,
nlist * sizeof (struct link_map *)); nlist * sizeof (struct link_map *));
if (__builtin_expect (nlist > 1, 1))
{
/* We can skip looking for the binary itself which is at the front /* We can skip looking for the binary itself which is at the front
of the search list. */ of the search list. */
assert (nlist > 1);
i = 1; i = 1;
bool seen[nlist]; bool seen[nlist];
memset (seen, false, nlist * sizeof (seen[0])); memset (seen, false, nlist * sizeof (seen[0]));
@ -657,7 +658,8 @@ Filters not supported with LD_TRACE_PRELINKING"));
goto next_clear; goto next_clear;
} }
memmove (&seen[i], &seen[i + 1], (k - i) * sizeof (seen[0])); memmove (&seen[i], &seen[i + 1],
(k - i) * sizeof (seen[0]));
seen[k] = true; seen[k] = true;
goto next; goto next;
@ -673,6 +675,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
next:; next:;
} }
}
/* Terminate the list of dependencies. */ /* Terminate the list of dependencies. */
l_initfini[nlist] = NULL; l_initfini[nlist] = NULL;

6
elf/dl-fini.c
View File

@ -33,9 +33,12 @@ internal_function
_dl_sort_fini (struct link_map *l, struct link_map **maps, size_t nmaps, _dl_sort_fini (struct link_map *l, struct link_map **maps, size_t nmaps,
char *used, Lmid_t ns) char *used, Lmid_t ns)
{ {
/* A list of one element need not be sorted. */
if (nmaps == 1)
return;
/* We can skip looking for the binary itself which is at the front /* We can skip looking for the binary itself which is at the front
of the search list for the main namespace. */ of the search list for the main namespace. */
assert (nmaps > 1);
unsigned int i = ns == LM_ID_BASE; unsigned int i = ns == LM_ID_BASE;
bool seen[nmaps]; bool seen[nmaps];
memset (seen, false, nmaps * sizeof (seen[0])); memset (seen, false, nmaps * sizeof (seen[0]));
@ -195,7 +198,6 @@ _dl_fini (void)
assert (ns == LM_ID_BASE || i == nloaded || i == nloaded - 1); assert (ns == LM_ID_BASE || i == nloaded || i == nloaded - 1);
nmaps = i; nmaps = i;
if (nmaps > 1)
/* Now we have to do the sorting. */ /* Now we have to do the sorting. */
_dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns); _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns);

1
elf/rtld.c
View File

@ -922,7 +922,6 @@ dl_main (const ElfW(Phdr) *phdr,
/* Process the environment variable which control the behaviour. */ /* Process the environment variable which control the behaviour. */
process_envvars (&mode); process_envvars (&mode);
mode=trace;
#ifndef HAVE_INLINED_SYSCALLS #ifndef HAVE_INLINED_SYSCALLS
/* Set up a flag which tells we are just starting. */ /* Set up a flag which tells we are just starting. */