about summary refs log tree commit diff
path: root/nptl_db
diff options
context:
space:
mode:
Diffstat (limited to 'nptl_db')
-rw-r--r--nptl_db/ChangeLog4
-rw-r--r--nptl_db/structs.def6
2 files changed, 5 insertions, 5 deletions
diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index 3a8c3c68e8..6ec5ea3be0 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -3,10 +3,6 @@
 	* nptl_db/db_info.c [TLS_DTV_AT_TP]: Fixed size init for dtvp
 	to sizeof a pointer, instead of sizeof the union.
 
-2006-10-27  Ulrich Drepper  <drepper@redhat.com>
-
-	* structs.def: USE_TLS support is now default.
-
 2006-02-03  Roland McGrath  <roland@redhat.com>
 
 	* structs.def: Add a descriptor for pointer.val field of dtv_t.
diff --git a/nptl_db/structs.def b/nptl_db/structs.def
index 20fa014909..823af5cba2 100644
--- a/nptl_db/structs.def
+++ b/nptl_db/structs.def
@@ -68,11 +68,15 @@ DB_STRUCT_FIELD (pthread_key_data, data)
 DB_STRUCT (pthread_key_data_level2)
 DB_STRUCT_ARRAY_FIELD (pthread_key_data_level2, data)
 
+#if USE_TLS
 DB_STRUCT_FIELD (link_map, l_tls_modid)
+#endif
 
+#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.  */
+# 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)
 #endif