diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl_db/ChangeLog | 13 | ||||
| -rw-r--r-- | nptl_db/td_thr_tls_get_addr.c | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list | 4 |
4 files changed, 29 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index 313a47e58c..aa2df0f5a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-03-10 Martin Schwidefsky <schwidefsky@de.ibm.com> + + * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Correct system + call names for pread and pwrite. + 2003-03-10 Roland McGrath <roland@redhat.com> * dlfcn/Makefile (libdl-routines): Add dladdr1. diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog index 51507040d3..bf6241264f 100644 --- a/nptl_db/ChangeLog +++ b/nptl_db/ChangeLog @@ -1,8 +1,13 @@ -2003-03-10 Ulrich Drepper <drepper@redhat.com> +2003-03-10 Roland McGrath <roland@redhat.com> - * td_ta_thr_iter.c: Update for TCB change. - * td_thr_tls_get_addr.c: Likewise. - * td_thr_validate.c: Likewise. + * td_ta_thr_iter.c (iterate_thread_list): Don't use `header.data.' + prefix for `struct pthread' members. + * td_thr_validate.c (check_thread_list): Likewise. + * td_thr_tls_get_addr.c (td_thr_tls_get_addr): Likewise. + +2003-03-03 Roland McGrath <roland@redhat.com> + + * td_thr_tls_get_addr.c (td_thr_tls_get_addr): Handle TLS_DTV_AT_TP. 2003-02-15 Ulrich Drepper <drepper@redhat.com> diff --git a/nptl_db/td_thr_tls_get_addr.c b/nptl_db/td_thr_tls_get_addr.c index 1c4aab4715..781ed2ca6e 100644 --- a/nptl_db/td_thr_tls_get_addr.c +++ b/nptl_db/td_thr_tls_get_addr.c @@ -18,10 +18,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - -#include "link.h" +#include <stddef.h> +#include <link.h> #include "thread_dbP.h" + /* Value used for dtv entries for which the allocation is delayed. */ # define TLS_DTV_UNALLOCATED ((void *) -1l) @@ -38,9 +39,17 @@ td_thr_tls_get_addr (const td_thrhandle_t *th __attribute__ ((unused)), LOG ("td_thr_tls_get_addr"); + psaddr_t dtvpp = th->th_unique; +#if TLS_TCB_AT_TP + dtvpp += offsetof (struct pthread, dtv); +#elif TLS_DTV_AT_TP + dtvpp += TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv); +#else +# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined." +#endif + /* Get the DTV pointer from the thread descriptor. */ - if (ps_pdread (th->th_ta_p->ph, &((struct pthread *) th->th_unique)->dtv, - &dtvp, sizeof dtvp) != PS_OK) + if (ps_pdread (th->th_ta_p->ph, dtvpp, &dtvp, sizeof dtvp) != PS_OK) return TD_ERR; /* XXX Other error value? */ /* Read the module ID from the link_map. */ diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list index 53284318d4..c2bf5c3307 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list @@ -2,8 +2,8 @@ llseek EXTRA lseek C:3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64 lseek llseek - -pread - pread C:4 __libc_pread __libc_pread64 __pread pread __pread64 pread64 -pwrite - pwrite C:4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64 +pread - pread64 C:4 __libc_pread __libc_pread64 __pread pread __pread64 pread64 +pwrite - pwrite64 C:4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64 fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64 statfs - statfs i:sp __statfs statfs statfs64 getpeername - getpeername i:ipp __getpeername getpeername |