diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h | 4 | ||||
| -rw-r--r-- | nptl/ChangeLog | 13 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/sem_post.S | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S | 4 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/sysdep.h | 2 |
10 files changed, 34 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog index d030c662cd..b6ba4c9c70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-06-29 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/unix/sysv/linux/sh/sysdep.h (SYSCALL_ERROR_HANDLER): + Fix branch offset for a PLT entry. + 2004-06-20 Jim Meyering <jim@meyering.net> * malloc/obstack.h (obstack_base): Cast to `void *', to align with diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index e5cd5efdb5..69209f8914 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2004-06-29 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h (CENABLE): Fix + branch offset for a PLT entry. + (CDISABLE): Likewise. + 2004-05-31 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/mips/Makefile (CFLAGS-pt-initfini.s): diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index 1ba48decb7..9fac494a9f 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -114,7 +114,7 @@ mov r0,r2; \ .align 2; \ 1: .long _GLOBAL_OFFSET_TABLE_; \ - 2: .long __local_enable_asynccancel@PLT - (0b+2-.); \ + 2: .long __local_enable_asynccancel@PLT - (0b-.); \ 3: mov.l @r15+,r12 # define CDISABLE \ @@ -129,7 +129,7 @@ nop; \ .align 2; \ 1: .long _GLOBAL_OFFSET_TABLE_; \ - 2: .long __local_disable_asynccancel@PLT - (0b+2-.); \ + 2: .long __local_disable_asynccancel@PLT - (0b-.); \ 3: mov.l @r15+,r12 # else # define CENABLE \ diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 6ef7ff136f..ce72d2738e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,16 @@ +2004-06-29 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/unix/sysv/linux/sh/pthread_once.S (__pthread_once): + Fix branch offset for a PLT entry. + * sysdeps/unix/sysv/linux/sh/sem_post.S (__new_sem_post): + Likewise. + * sysdeps/unix/sysv/linux/sh/sem_timedwait.S (sem_timedwait): + Likewise. + * sysdeps/unix/sysv/linux/sh/sem_trywait.S (__new_sem_trywait): + Likewise. + * sysdeps/unix/sysv/linux/sh/sem_wait.S (__new_sem_wait): + Likewise. + 2004-06-28 Jakub Jelinek <jakub@redhat.com> * sysdeps/alpha/tcb-offsets.sym (MULTIPLE_THREADS_OFFSET): Define diff --git a/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S b/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S index 9b583a8317..02af56b4c7 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/pthread_once.S @@ -210,7 +210,7 @@ __pthread_once: .align 2 .Lsigsetjmp: - .long __sigsetjmp@PLT-(.Lsigsetjmp0+2-.) + .long __sigsetjmp@PLT-(.Lsigsetjmp0-.) .Lcpush: .long HIDDEN_JUMPTARGET(__pthread_register_cancel)-.Lcpush0 .Lcpop: diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S index a080e17abe..9bc12da7e0 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_post.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* 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 @@ -81,7 +81,7 @@ __new_sem_post: .long errno@GOTTPOFF #else .Lerrloc3: - .long __errno_location@PLT-(.Lerrloc3b+2-.) + .long __errno_location@PLT-(.Lerrloc3b-.) #endif .size __new_sem_post,.-__new_sem_post versioned_symbol(libpthread, __new_sem_post, sem_post, GLIBC_2_1) diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S index dbeda87a6c..27a1bb019d 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S @@ -228,7 +228,7 @@ sem_timedwait: .long errno@GOTTPOFF #else .Lerrloc2: - .long __errno_location@PLT-(.Lerrloc2b+2-.) + .long __errno_location@PLT-(.Lerrloc2b-.) #endif .Lenable0: .long __pthread_enable_asynccancel-.Lenable0b diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S index 0091e53e7c..ccdf3a0dbd 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_trywait.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* 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 @@ -83,7 +83,7 @@ __new_sem_trywait: .long errno@GOTTPOFF #else .Lerrloc1: - .long __errno_location@PLT-(.Lerrloc1b+2-.) + .long __errno_location@PLT-(.Lerrloc1b-.) #endif .size __new_sem_trywait,.-__new_sem_trywait versioned_symbol(libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1) diff --git a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S index d51f12aa54..9ceb8f1c24 100644 --- a/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S +++ b/nptl/sysdeps/unix/sysv/linux/sh/sem_wait.S @@ -155,7 +155,7 @@ __new_sem_wait: .long errno@GOTTPOFF #else .Lerrloc0: - .long __errno_location@PLT-(.Lerrloc0b+2-.) + .long __errno_location@PLT-(.Lerrloc0b-.) #endif .Lenable0: .long __pthread_enable_asynccancel-.Lenable0b diff --git a/sysdeps/unix/sysv/linux/sh/sysdep.h b/sysdeps/unix/sysv/linux/sh/sysdep.h index e1fad87ffe..35b8a58afa 100644 --- a/sysdeps/unix/sysv/linux/sh/sysdep.h +++ b/sysdeps/unix/sysv/linux/sh/sysdep.h @@ -160,7 +160,7 @@ mov _IMM1,r0; \ .align 2; \ 0: .long _GLOBAL_OFFSET_TABLE_; \ - 1: .long PLTJMP(C_SYMBOL_NAME(__errno_location))-(2b+2-.) + 1: .long PLTJMP(C_SYMBOL_NAME(__errno_location))-(2b-.) /* A quick note: it is assumed that the call to `__errno_location' does not modify the stack! */ # endif |