From 763c0490a22c03e1f5e9c9a4279e975c2e4953c3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 6 Jan 2004 10:31:21 +0000 Subject: * sysdeps/alpha/tls.h (DB_THREAD_SELF): Pass bit size of thread register as second parameter to the REGISTER macro. * sysdeps/ia64/tls.h (DB_THREAD_SELF): Likewise. * sysdeps/powerpc/tls.h (DB_THREAD_SELF): Likewise. * sysdeps/sh/tls.h (DB_THREAD_SELF): Likewise. * sysdeps/sparc/tls.h (DB_THREAD_SELF): Likewise. * sysdeps/s390/tls.h (DB_THREAD_SELF): Pass __WORDSIZE as bit size of thread register as second parameter to REGISTER macro in 64 case. --- nptl/ChangeLog | 11 +++++++++++ nptl/sysdeps/alpha/tls.h | 2 +- nptl/sysdeps/ia64/tls.h | 2 +- nptl/sysdeps/powerpc/tls.h | 4 ++-- nptl/sysdeps/s390/tls.h | 7 ++++--- nptl/sysdeps/sh/tls.h | 2 +- nptl/sysdeps/sparc/tls.h | 2 +- nptl_db/ChangeLog | 5 +++++ 8 files changed, 26 insertions(+), 9 deletions(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 2f9878e31d..f77a2a1c5e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,14 @@ +2003-12-11 Ulrich Weigand + + * sysdeps/alpha/tls.h (DB_THREAD_SELF): Pass bit size of thread + register as second parameter to the REGISTER macro. + * sysdeps/ia64/tls.h (DB_THREAD_SELF): Likewise. + * sysdeps/powerpc/tls.h (DB_THREAD_SELF): Likewise. + * sysdeps/sh/tls.h (DB_THREAD_SELF): Likewise. + * sysdeps/sparc/tls.h (DB_THREAD_SELF): Likewise. + * sysdeps/s390/tls.h (DB_THREAD_SELF): Pass __WORDSIZE as bit size + of thread register as second parameter to REGISTER macro in 64 case. + 2004-01-03 Ulrich Drepper * sysdeps/unix/sysv/linux/Makefile (CFLAGS-getpid.c): Removed. diff --git a/nptl/sysdeps/alpha/tls.h b/nptl/sysdeps/alpha/tls.h index 8f61bb7409..f947fcf648 100644 --- a/nptl/sysdeps/alpha/tls.h +++ b/nptl/sysdeps/alpha/tls.h @@ -120,7 +120,7 @@ typedef struct /* Magic for libthread_db to know how to do THREAD_SELF. */ # define DB_THREAD_SELF \ - REGISTER (64, 32 * 8, - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE) + REGISTER (64, 64, 32 * 8, - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE) /* Identifier for the current thread. THREAD_SELF is usable but sometimes more expensive than necessary as in this case. */ diff --git a/nptl/sysdeps/ia64/tls.h b/nptl/sysdeps/ia64/tls.h index 262944d89f..a37d6f4d32 100644 --- a/nptl/sysdeps/ia64/tls.h +++ b/nptl/sysdeps/ia64/tls.h @@ -123,7 +123,7 @@ register struct pthread *__thread_self __asm__("r13"); # define THREAD_SELF (__thread_self - 1) /* Magic for libthread_db to know how to do THREAD_SELF. */ -# define DB_THREAD_SELF REGISTER (64, 13 * 8, -sizeof (struct pthread)) +# define DB_THREAD_SELF REGISTER (64, 64, 13 * 8, -sizeof (struct pthread)) /* Access to data in the thread descriptor is easy. */ #define THREAD_GETMEM(descr, member) \ diff --git a/nptl/sysdeps/powerpc/tls.h b/nptl/sysdeps/powerpc/tls.h index 02595637c7..ce7f5bd53d 100644 --- a/nptl/sysdeps/powerpc/tls.h +++ b/nptl/sysdeps/powerpc/tls.h @@ -131,9 +131,9 @@ register void *__thread_register __asm__ ("r13"); /* Magic for libthread_db to know how to do THREAD_SELF. */ # define DB_THREAD_SELF \ - REGISTER (32, PT_THREAD_POINTER * 4, \ + REGISTER (32, 32, PT_THREAD_POINTER * 4, \ - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE) \ - REGISTER (64, PT_THREAD_POINTER * 8, \ + REGISTER (64, 64, PT_THREAD_POINTER * 8, \ - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE) /* Read member of the thread descriptor directly. */ diff --git a/nptl/sysdeps/s390/tls.h b/nptl/sysdeps/s390/tls.h index 7b38e3389d..b038910387 100644 --- a/nptl/sysdeps/s390/tls.h +++ b/nptl/sysdeps/s390/tls.h @@ -1,5 +1,5 @@ -/* Definition for thread-local data handling. nptl/s390 version. - Copyright (C) 2003 Free Software Foundation, Inc. +/* Definition for thread-local data handling. NPTL/s390 version. + Copyright (C) 2003, 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 @@ -138,7 +138,8 @@ typedef struct # define THREAD_SELF ((struct pthread *) __builtin_thread_pointer ()) /* Magic for libthread_db to know how to do THREAD_SELF. */ -# define DB_THREAD_SELF REGISTER (32, 18 * 4, 0) REGISTER (64, 18 * 8, 0) +# define DB_THREAD_SELF REGISTER (32, 32, 18 * 4, 0) \ + REGISTER (64, __WORDSIZE, 18 * 8, 0) /* Access to data in the thread descriptor is easy. */ #define THREAD_GETMEM(descr, member) \ diff --git a/nptl/sysdeps/sh/tls.h b/nptl/sysdeps/sh/tls.h index b6d8428bf6..88b13a35c8 100644 --- a/nptl/sysdeps/sh/tls.h +++ b/nptl/sysdeps/sh/tls.h @@ -118,7 +118,7 @@ typedef struct __self - 1;}) /* Magic for libthread_db to know how to do THREAD_SELF. */ -# define DB_THREAD_SELF REGISTER (32, REG_GBR * 4, 0) +# define DB_THREAD_SELF REGISTER (32, 32, REG_GBR * 4, 0) /* Read member of the thread descriptor directly. */ # define THREAD_GETMEM(descr, member) (descr->member) diff --git a/nptl/sysdeps/sparc/tls.h b/nptl/sysdeps/sparc/tls.h index 8c4264f24f..8980f9fc0c 100644 --- a/nptl/sysdeps/sparc/tls.h +++ b/nptl/sysdeps/sparc/tls.h @@ -107,7 +107,7 @@ register struct pthread *__thread_self __asm__("%g7"); /* Magic for libthread_db to know how to do THREAD_SELF. */ # define DB_THREAD_SELF_INCLUDE # define DB_THREAD_SELF \ - REGISTER (32, REG_G7 * 4, 0) REGISTER (64, REG_G7 * 8, 0) + REGISTER (32, 32, REG_G7 * 4, 0) REGISTER (64, 64, REG_G7 * 8, 0) /* Access to data in the thread descriptor is easy. */ #define THREAD_GETMEM(descr, member) \ diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog index 05f1c853cf..1d17a76066 100644 --- a/nptl_db/ChangeLog +++ b/nptl_db/ChangeLog @@ -1,3 +1,8 @@ +2003-12-11 Ulrich Weigand + + * db_info.c (REGISTER): Add bit size of thread register as second + parameter to REGISTER macro. + 2003-12-02 Roland McGrath * thread_dbP.h (DB_FUNCTION): New macro. -- cgit 1.4.1