diff options
author | Ulrich Drepper <drepper@redhat.com> | 2003-01-28 10:42:28 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2003-01-28 10:42:28 +0000 |
commit | e6ebd2e4db59da6c1726ecfa3516f1f1b3048442 (patch) | |
tree | dfa3797737a8e4dc76ed38e52cf7baa27e936003 /sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S | |
parent | 772e3426a7b6f5200cb1029d41308b8b666cdbab (diff) |
Update.
2003-01-27 Martin Schwidefsky <schwidefsky@de.ibm.com>
* elf/elf.h: Add new s390 relocs.
* elf/tls-macros.h: Add s390 versions.
* sysdeps/s390/Versions [GLIBC_2.3] (ld): Export __tls_get_offset.
* sysdeps/s390/dl-tls.h: New file.
* sysdeps/s390/libc-tls.c: New file.
* sysdeps/s390/s390-32/dl-machine.h (elf_machine_type_class): Add TLS
relocs for class PLT.
(elf_machine_rela): Handle TLS relocs.
* sysdeps/s390/s390-64/dl-machine.h: Likewise.
* sysdeps/s390/s390-32/elf/configure.in: Add TLS check.
* sysdeps/s390/s390-64/elf/configure.in: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Add support for
CLONE_CHILD_*TID flags.
* sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/mmap.S: Use branch with 32
bit offset.
* sysdeps/unix/sysv/linux/s390/s390-64/socket.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscall.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S (__syscall_error):
Support USE___THREAD. Define RTLD_PRIVATE_ERRNO variant.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S (__syscall_error):
Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h:
(SYSCALL_ERROR_LABEL): Move define next to SYSCALL_ERROR_HANDLER.
(SYSCALL_ERROR_HANDLER): Add USE___THREAD and RTLD_PRIVATE_ERRNO
variants.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h:
(SYSCALL_ERROR_LABEL): Move define next to SYSCALL_ERROR_HANDLER. Use
direct branch to syscall_error for !PIC and PIC && !_LIBC_REENTRANT.
(SYSCALL_ERROR_HANDLER): Add USE___THREAD and RTLD_PRIVATE_ERRNO
variants.
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S')
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S | 139 |
1 files changed, 87 insertions, 52 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S index 98b00722d8..94d772f67e 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -31,59 +31,94 @@ .text ENTRY(__syscall_error) #ifndef PIC -#ifndef _LIBC_REENTRANT - lcr %r2,%r2 - basr %r1,0 -.L0: l %r1,.L1-.L0(%r1) - st %r2,0(0,%r1) - lhi %r2,-1 - br %r14 -.L1: .long errno -#else - stm %r11,%r15,44(%r15) - lr %r0,%r15 - ahi %r15,-96 - st %r0,0(%r15) - lcr %r11,%r2 - basr %r13,0 -.L0: l %r1,.L1-.L0(%r13) - basr %r14,%r1 - st %r11,0(%r2) - lhi %r2,-1 - l %r15,0(%r15) - lm %r11,%r15,44(%r15) - br %r14 -.L1: .long __errno_location +# if USE___THREAD +# ifndef NOT_IN_libc +# define SYSCALL_ERROR_ERRNO __libc_errno +# else +# define SYSCALL_ERROR_ERRNO errno +# endif + basr %r1,0 +0: l %r1,1f-0b(%r1) + ear %r3,%a0 + lcr %r2,%r2 + st %r2,0(%r1,%r3) + lhi %r2,-1 + br %r14 +1: .long SYSCALL_ERROR_ERRNO@ntpoff +# elif !defined _LIBC_REENTRANT + basr %r1,0 +0: l %r1,1f-0b(%r1) + lcr %r2,%r2 + st %r2,0(%r1) + lhi %r2,-1 + br %r14 +1: .long errno +# else + stm %r13,%r15,52(%r15) + lr %r0,%r15 + ahi %r15,-96 + lcr %r13,%r2 + st %r0,0(%r15) + basr %r1,0 +0: l %r1,1f-0b(%r1) + basr %r14,%r1 + st %r13,0(%r2) + lm %r13,%r15,148(%r15) + lhi %r2,-1 + br %r14 +1: .long __errno_location #endif #else -#ifndef _LIBC_REENTRANT - basr %r1,0 -.L0: al %r1,.L1-.L0(%r1) - l %r1,errno@GOT12(%r1) - lcr %r2,%r2 - st %r2,0(0,%r1) - lhi %r2,-1 - br %r14 -.L1: .long _GLOBAL_OFFSET_TABLE_-0b -#else - stm %r11,%r15,44(%r15) - lr %r0,%r15 - ahi %r15,-96 - st %r0,0(%r15) - lcr %r11,%r2 - basr %r13,0 -.L0: l %r12,.L1-.L0(%r13) - ar %r12,%r13 - l %r14,.L2-.L0(%r13) - bas %r14,0(%r14,%r13) - st %r11,0(0,%r2) - lhi %r2,-1 - l %r15,0(%r15) - lm %r11,%r15,44(%r15) - br %r14 -.L1: .long _GLOBAL_OFFSET_TABLE_ - .L0 -.L2: .long __errno_location@PLT - .L0 -#endif +# if RTLD_PRIVATE_ERRNO + basr %r1,0 +0: al %r1,1f-0b(%r1) + lcr %r2,%r2 + st %r2,0(%r1) + lhi %r2,-1 + br %r14 +1: .long errno - 0b +# elif USE___THREAD +# ifndef NOT_IN_libc +# define SYSCALL_ERROR_ERRNO __libc_errno +# else +# define SYSCALL_ERROR_ERRNO errno +# endif + basr %r1,0 +0: al %r1,1f-0b(%r1) + ear %r3,%a0 + l %r1,SYSCALL_ERROR_ERRNO@gotntpoff(%r1) + lcr %r2,%r2 + st %r2,0(%r1,%r3) + lhi %r2,-1 + br %r14 +1: .long _GLOBAL_OFFSET_TABLE_-0b +# elif !defined _LIBC_REENTRANT + basr %r1,0 +0: al %r1,1f-0b(%r1) + l %r1,errno@GOT(%r1) + lcr %r2,%r2 + st %r2,0(0,%r1) + lhi %r2,-1 + br %r14 +1: .long _GLOBAL_OFFSET_TABLE_-0b +# else + stm %r11,%r15,44(%r15) + lr %r0,%r15 + ahi %r15,-96 + lcr %r11,%r2 + st %r0,0(%r15) + basr %r13,0 +0: l %r12,1f-0b(%r13) + l %r1,2f-0b(%r13) + la %r12,0(%r12,%r13) + bas %r14,0(%r1,%r13) + st %r11,0(%r2) + lm %r11,%r15,140(%r15) + lhi %r2,-1 + br %r14 +1: .long _GLOBAL_OFFSET_TABLE_-0b +2: .long __errno_location@PLT-0b +# endif #endif END (__syscall_error) |