summaryrefslogtreecommitdiff
path: root/nptl_db
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 /nptl_db
parent7d58530341304d403a6626d7f7a1913165fe2f32 (diff)
downloadglibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.gz
2.5-18.1
Diffstat (limited to 'nptl_db')
-rw-r--r--nptl_db/ChangeLog11
-rw-r--r--nptl_db/db_info.c2
-rw-r--r--nptl_db/structs.def4
-rw-r--r--nptl_db/td_thr_tlsbase.c13
4 files changed, 24 insertions, 6 deletions
diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index 52c8491384..6ec5ea3be0 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-26 Pete Eberlein <eberlein@us.ibm.com>
+
+ * nptl_db/db_info.c [TLS_DTV_AT_TP]: Fixed size init for dtvp
+ to sizeof a pointer, instead of sizeof the union.
+
+2006-02-03 Roland McGrath <roland@redhat.com>
+
+ * structs.def: Add a descriptor for pointer.val field of dtv_t.
+ * td_thr_tlsbase.c (td_thr_tlsbase): Extract pointer.val field from
+ DTV slot.
+
2004-09-09 Roland McGrath <roland@redhat.com>
* td_ta_map_lwp2thr.c (td_ta_map_lwp2thr): Don't abort if inferior's
diff --git a/nptl_db/db_info.c b/nptl_db/db_info.c
index 5000b99ba5..6d5eb4b1d8 100644
--- a/nptl_db/db_info.c
+++ b/nptl_db/db_info.c
@@ -59,7 +59,7 @@ typedef struct link_map link_map;
i.e. at the very end of the area covered by TLS_PRE_TCB_SIZE. */
DESC (_thread_db_pthread_dtvp,
TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv)
- - (TLS_TCB_SIZE == 0 ? sizeof (tcbhead_t) : 0), union dtv)
+ - (TLS_TCB_SIZE == 0 ? sizeof (tcbhead_t) : 0), union dtv *)
#endif
diff --git a/nptl_db/structs.def b/nptl_db/structs.def
index b17a628e0a..823af5cba2 100644
--- a/nptl_db/structs.def
+++ b/nptl_db/structs.def
@@ -1,5 +1,5 @@
/* List of types and symbols in libpthread examined by libthread_db.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 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
@@ -74,6 +74,8 @@ DB_STRUCT_FIELD (link_map, l_tls_modid)
#if !defined IS_IN_libpthread || USE_TLS
DB_STRUCT_ARRAY_FIELD (dtv, dtv)
+# define pointer_val pointer.val /* Field of anonymous struct in dtv_t. */
+DB_STRUCT_FIELD (dtv_t, pointer_val)
#endif
#if !defined IS_IN_libpthread || TLS_TCB_AT_TP
DB_STRUCT_FIELD (pthread, dtvp)
diff --git a/nptl_db/td_thr_tlsbase.c b/nptl_db/td_thr_tlsbase.c
index c57009a73c..aaeda6f3c6 100644
--- a/nptl_db/td_thr_tlsbase.c
+++ b/nptl_db/td_thr_tlsbase.c
@@ -1,5 +1,5 @@
/* Locate TLS data for a thread.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 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
@@ -25,7 +25,7 @@ td_thr_tlsbase (const td_thrhandle_t *th,
psaddr_t *base)
{
td_err_e err;
- psaddr_t dtv, dtvptr;
+ psaddr_t dtv, dtvslot, dtvptr;
if (modid < 1)
return TD_NOTLS;
@@ -35,8 +35,13 @@ td_thr_tlsbase (const td_thrhandle_t *th,
if (err != TD_OK)
return err;
- /* Get the corresponding entry in the DTV. */
- err = DB_GET_FIELD (dtvptr, th->th_ta_p, dtv, dtv, dtv, modid);
+ /* Find the corresponding entry in the DTV. */
+ err = DB_GET_FIELD_ADDRESS (dtvslot, th->th_ta_p, dtv, dtv, dtv, modid);
+ if (err != TD_OK)
+ return err;
+
+ /* Extract the TLS block address from that DTV slot. */
+ err = DB_GET_FIELD (dtvptr, th->th_ta_p, dtvslot, dtv_t, pointer_val, 0);
if (err != TD_OK)
return err;