lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

elf: Add initial flag argument to __libc_early_init

Browse Source 
The rseq initialization should happen only for the libc in the base
namespace (in the dynamic case) or the statically linked libc.  The
__libc_multiple_libcs flag does not quite cover this case at present,
so this commit introduces a flag argument to __libc_early_init,
indicating whether the libc being libc is the primary one (of the main
program).

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer
2020-04-29 15:44:03 +02:00
parent 2ad5d0845d
commit 03e187a41d
6 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
elf/dl-open.c
View File

@ -748,9 +748,22 @@ dl_open_worker (void *a)
LIBC_PROBE (reloc_complete, 3, args->nsid, r, new);
/* If libc.so was not there before, attempt to call its early
initialization routine. */
initialization routine. Indicate to the initialization routine
whether the libc being initialized is the one in the base
namespace. */
if (!args->libc_already_loaded)
_dl_call_libc_early_init (GL(dl_ns)[args->nsid].libc_map);
{
struct link_map *libc_map = GL(dl_ns)[args->nsid].libc_map;
#ifdef SHARED
bool initial = libc_map->l_ns == LM_ID_BASE;
#else
/* In the static case, there is only one namespace, but it
contains a secondary libc (the primary libc is statically
linked). */
bool initial = false;
#endif
_dl_call_libc_early_init (libc_map, initial);
}
#ifndef SHARED
DL_STATIC_INIT (new);