diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-11-07 22:59:31 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-11-07 22:59:31 +0000 |
| commit | 2a9b4a0cce09a1bccb092ddc9fb98532ec8b720f (patch) | |
| tree | d89ccfd8639aaf3a0ece7ac6ccff0b345ba757c7 /libc/nptl_db | |
| parent | 5464a78aac33302c987c3dab8463f53c3c1dd7df (diff) | |
Merge changes between r426 and r615 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@616 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl_db')
| -rw-r--r-- | libc/nptl_db/ChangeLog | 9 | ||||
| -rw-r--r-- | libc/nptl_db/db_info.c | 2 | ||||
| -rw-r--r-- | libc/nptl_db/structs.def | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/libc/nptl_db/ChangeLog b/libc/nptl_db/ChangeLog index 2bb82f488..3a8c3c68e 100644 --- a/libc/nptl_db/ChangeLog +++ b/libc/nptl_db/ChangeLog @@ -1,3 +1,12 @@ +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-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/libc/nptl_db/db_info.c b/libc/nptl_db/db_info.c index 5000b99ba..6d5eb4b1d 100644 --- a/libc/nptl_db/db_info.c +++ b/libc/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/libc/nptl_db/structs.def b/libc/nptl_db/structs.def index 823af5cba..20fa01490 100644 --- a/libc/nptl_db/structs.def +++ b/libc/nptl_db/structs.def @@ -68,15 +68,11 @@ 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 |