diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/sh/tls.h | 3 | ||||
| -rw-r--r-- | sysdeps/hppa/dl-machine.h | 6 |
4 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 9cadb342fc..d5cc33e7d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-17 Randolph Chung <tausq@debian.org> + + * sysdeps/hppa/dl-machine.h (TRAMPOLINE_TEMPLATE): Add unwind + annotations. + 2004-11-18 Jakub Jelinek <jakub@redhat.com> [BZ #544] diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 4c63f9e147..d1cb65559c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2004-11-18 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/sh/tls.h (DB_THREAD_SELF): Set the correct bias + parameter to REGISTER macro. + 2004-11-17 Roland McGrath <roland@redhat.com> * sysdeps/unix/sysv/linux/timer_routines.c (__start_helper_thread): diff --git a/nptl/sysdeps/sh/tls.h b/nptl/sysdeps/sh/tls.h index 88b13a35c8..db490ab7ee 100644 --- a/nptl/sysdeps/sh/tls.h +++ b/nptl/sysdeps/sh/tls.h @@ -118,7 +118,8 @@ typedef struct __self - 1;}) /* Magic for libthread_db to know how to do THREAD_SELF. */ -# define DB_THREAD_SELF REGISTER (32, 32, REG_GBR * 4, 0) +# define DB_THREAD_SELF \ + REGISTER (32, 32, REG_GBR * 4, -sizeof (struct pthread)) /* Read member of the thread descriptor directly. */ # define THREAD_GETMEM(descr, member) (descr->member) diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h index bc9ed107b8..d29501d306 100644 --- a/sysdeps/hppa/dl-machine.h +++ b/sysdeps/hppa/dl-machine.h @@ -495,6 +495,9 @@ asm ( \ " .globl " #tramp_name "\n" \ " .type " #tramp_name ",@function\n" \ #tramp_name ":\n" \ + " .proc\n" \ + " .callinfo frame=64,calls,save_rp\n" \ + " .entry\n" \ /* Save return pointer */ \ " stw %r2,-20(%sp)\n" \ /* Save argument registers in the call stack frame. */ \ @@ -526,7 +529,8 @@ asm ( \ " bv %r0(%r22)\n" \ /* Return pointer. */ \ " ldw -20(%sp),%r2\n" \ - ); + " .exit\n" \ + " .procend\n"); #ifndef PROF #define ELF_MACHINE_RUNTIME_TRAMPOLINE \ |