mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +08:00
c0f62c5678
Update. Add support for namespaces in the dynamic linker. * dlfcn/Makefile (libdl-routines): Add dlmopen. * dlfcn/Versions [libdl, GLIBC_2.3.4]: Add dlmopen. * dlfcn/dlfcn.h: Define Lmid_t, LM_ID_BASE, and LM_ID_NEWLM. Declare dlmopen. Document RTLD_DI_LMID. * dlfcn/dlinfo.c: Handle RTLD_DI_LMID. * dlfcn/dlmopen.c: New file. * dlfcn/dlopen.c: Pass new parameter to _dl_open. * dlfcn/dlopenold.c: Likewise. * elf/dl-addr.c: Adjust for removal of GL(dl_loaded). * elf/dl-caller.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-conflict.c: Likewise. * elf/dl-debug.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-version.c: Likewise. * elf/do-lookup.h: Likewise. * elf/rtld.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-librecon.h: Likewise. * elf/dl-depsc: Likewise. Add new parameter to _dl_map_object. * elf/dl-fini.c: Call destructors in all namespaces. * elf/dl-iteratephdr.c: Compute total nloaded. Adjust for removal of GL(dl_loaded). * elf/dl-libc.c: Pass new parameter to _dl_open. Adjust for removal of GL(dl_loaded). * elf/dl-load.c (_dl_map_object_from_fd): Don't load ld.so a second time. Reuse the one from the main namespace in all others. Pass new parameter to _dl_new_object. Adjust for removal of GL(dl_loaded). * elf/dl-object.c: Take new parameter. Use it to initialize l_ns. Adjust for removal of GL(dl_loaded). * elf/dl-open.c (_dl_open): Take new parameter. Adjust for removal of GL(dl_loaded). * elf/dl-support.c: Replace global _dl_loaded etc variables with _dl_ns variable. * include/dlfcn.h: Adjust prototype of _dl_open. Define __LM_ID_CALLER. * include/link.h: Add l_real, l_ns, and l_direct_opencount elements. * sysdeps/generic/dl-tls.c: Bump TLS_STATIC_SURPLUS. Since libc is using TLS we need memory appropriate to the number of namespaces. * sysdeps/generic/ldsodefs.h (struct rtld_global): Replace _dl_loaded, _dl_nloaded, _dl_global_scope, _dl_main_searchlist, and _dl_global_scope_alloc with _dl_ns element. Define DL_NNS. Adjust prototypes of _dl_map_object and member in rtld_global_ro. * malloc/malloc.c: Include <dlfcn.h>. * malloc/arena.c (ptmalloc_init): If libc is not in primary namespace, never use brk. * elf/Makefile: Add rules to build and run tst-dlmopen1 and tst-dlmopen2. * elf/tst-dlmopen1.c: New file. * elf/tst-dlmopen1mod.c: New file. * elf/tst-dlmopen2.c: New file. * elf/dl-close.c: Improve reference counting by tracking direct loads. * elf/dl-lookup.c (add_dependency): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. * elf/rtld.c (dl_main): Likewise. 2004-09-09 GOTO Masanori <gotom@debian.or.jp> [BZ #77] * elf/dl-close.c: Count down l_opencount to check not only for l_reldeps, but also l_initfini. 2004-10-13 Ulrich Drepper <drepper@redhat.com>
60 lines
2.3 KiB
C
60 lines
2.3 KiB
C
/* Communicate dynamic linker state to the debugger at runtime.
|
|
Copyright (C) 1996, 1998, 2000, 2002, 2004 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <ldsodefs.h>
|
|
|
|
/* This structure communicates dl state to the debugger. The debugger
|
|
normally finds it via the DT_DEBUG entry in the dynamic section, but in
|
|
a statically-linked program there is no dynamic section for the debugger
|
|
to examine and it looks for this particular symbol name. */
|
|
struct r_debug _r_debug;
|
|
|
|
|
|
/* Initialize _r_debug if it has not already been done. The argument is
|
|
the run-time load address of the dynamic linker, to be put in
|
|
_r_debug.r_ldbase. Returns the address of _r_debug. */
|
|
|
|
struct r_debug *
|
|
internal_function
|
|
_dl_debug_initialize (ElfW(Addr) ldbase)
|
|
{
|
|
if (_r_debug.r_brk == 0)
|
|
{
|
|
/* Tell the debugger where to find the map of loaded objects. */
|
|
_r_debug.r_version = 1 /* R_DEBUG_VERSION XXX */;
|
|
_r_debug.r_ldbase = ldbase;
|
|
// XXX This is problematic. It means we cannot tell the debugger
|
|
// XXX about namespaces other than the main one.
|
|
_r_debug.r_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded;
|
|
_r_debug.r_brk = (ElfW(Addr)) &_dl_debug_state;
|
|
}
|
|
|
|
return &_r_debug;
|
|
}
|
|
|
|
|
|
/* This function exists solely to have a breakpoint set on it by the
|
|
debugger. The debugger is supposed to find this function's address by
|
|
examining the r_brk member of struct r_debug, but GDB 4.15 in fact looks
|
|
for this particular symbol name in the PT_INTERP file. */
|
|
void
|
|
_dl_debug_state (void)
|
|
{
|
|
}
|