diff options
| author | Roland McGrath <roland@gnu.org> | 2004-10-04 20:59:38 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-10-04 20:59:38 +0000 |
| commit | 96c82b3feea4335a2e47d789deb96231b0aef7a0 (patch) | |
| tree | 515662d18a6b43b68b651f4f15ad9af07cc2547b /sysdeps/unix/sysv/linux/s390 | |
| parent | e4bb48539fa1012f4ec102d8a3b12e846a832ff5 (diff) | |
2004-10-04 Roland McGrath <roland@redhat.com>
* include/errno.h [RTLD_PRIVATE_ERRNO] (errno): Rename the real symbol
to rtld_errno.
* sysdeps/generic/errno.c [RTLD_PRIVATE_ERRNO] (rtld_errno): Define it,
and don't define any other errno names.
* sysdeps/unix/alpha/sysdep.h [RTLD_PRIVATE_ERRNO]: Use rtld_errno in
place of errno.
* sysdeps/unix/i386/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/m68k/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
* sysdeps/unix/x86_64/sysdep.S: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S index 1aad4ab164..2a1dad0695 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S @@ -82,7 +82,7 @@ ENTRY(__syscall_error) st %r2,0(%r1) lhi %r2,-1 br %r14 -1: .long errno - 0b +1: .long rtld_errno - 0b # elif USE___THREAD # ifndef NOT_IN_libc # define SYSCALL_ERROR_ERRNO __libc_errno diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h index 55a2cd7443..ad3cde6a66 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h @@ -97,7 +97,7 @@ st %r2,0(%r1); \ lhi %r2,-1; \ br %r14; \ -2: .long errno-1b +2: .long rtld_errno-1b # elif defined _LIBC_REENTRANT # if USE___THREAD # ifndef NOT_IN_libc diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S index 4299257afa..bb61e894f1 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S @@ -74,7 +74,7 @@ ENTRY(__syscall_error) #endif #else # if RTLD_PRIVATE_ERRNO - larl %r1,errno + larl %r1,rtld_errno lcr %r2,%r2 st %r2,0(%r1) lghi %r2,-1 @@ -100,7 +100,7 @@ ENTRY(__syscall_error) lcr %r2,%r2 st %r2,0(%r1) lghi %r2,-1 - br %r14 + br %r14 # else stmg %r13,%r15,104(%r15) cfi_offset (%r15,-40) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h index c7f3a03f26..45e701e7a4 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h @@ -101,7 +101,7 @@ # if RTLD_PRIVATE_ERRNO # define SYSCALL_ERROR_LABEL 0f # define SYSCALL_ERROR_HANDLER \ -0: larl %r1,errno; \ +0: larl %r1,rtld_errno; \ lcr %r2,%r2; \ st %r2,0(%r1); \ lghi %r2,-1; \ |