summaryrefslogtreecommitdiff
path: root/elf/dl-debug.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-07-12 18:26:36 +0000
committerJakub Jelinek <jakub@redhat.com>2007-07-12 18:26:36 +0000
commit0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (patch)
tree2ea1f8305970753e4a657acb2ccc15ca3eec8e2c /elf/dl-debug.c
parent7d58530341304d403a6626d7f7a1913165fe2f32 (diff)
downloadglibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.gz
2.5-18.1
Diffstat (limited to 'elf/dl-debug.c')
-rw-r--r--elf/dl-debug.c38
1 files changed, 28 insertions, 10 deletions
diff --git a/elf/dl-debug.c b/elf/dl-debug.c
index bd6ee69189..2538364aec 100644
--- a/elf/dl-debug.c
+++ b/elf/dl-debug.c
@@ -1,5 +1,6 @@
/* Communicate dynamic linker state to the debugger at runtime.
- Copyright (C) 1996, 1998, 2000, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1998,2000,2002,2004,2005,2006
+ 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
@@ -19,6 +20,18 @@
#include <ldsodefs.h>
+
+/* These are the members in the public `struct link_map' type.
+ Sanity check that the internal type and the public type match. */
+#define VERIFY_MEMBER(name) \
+ (offsetof (struct link_map_public, name) == offsetof (struct link_map, name))
+extern const int verify_link_map_members[(VERIFY_MEMBER (l_addr)
+ && VERIFY_MEMBER (l_name)
+ && VERIFY_MEMBER (l_ld)
+ && VERIFY_MEMBER (l_next)
+ && VERIFY_MEMBER (l_prev))
+ ? 1 : -1];
+
/* 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
@@ -32,20 +45,25 @@ struct r_debug _r_debug;
struct r_debug *
internal_function
-_dl_debug_initialize (ElfW(Addr) ldbase)
+_dl_debug_initialize (ElfW(Addr) ldbase, Lmid_t ns)
{
- if (_r_debug.r_brk == 0)
+ struct r_debug *r;
+
+ if (ns == LM_ID_BASE)
+ r = &_r_debug;
+ else
+ r = &GL(dl_ns)[ns]._ns_debug;
+
+ if (r->r_map == NULL || ldbase != 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;
+ r->r_version = 1 /* R_DEBUG_VERSION XXX */;
+ r->r_ldbase = ldbase ?: _r_debug.r_ldbase;
+ r->r_map = (void *) GL(dl_ns)[ns]._ns_loaded;
+ r->r_brk = (ElfW(Addr)) &_dl_debug_state;
}
- return &_r_debug;
+ return r;
}