diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 16:50:28 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 16:50:28 -0400 |
| commit | d063d164335938d557460bebaa7cfe388157b627 (patch) | |
| tree | 92ef3f54771c0a28190b76ee45f90d16fd39714f /sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S | |
| parent | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (diff) | |
| download | glibc-d063d164335938d557460bebaa7cfe388157b627.tar.gz glibc-d063d164335938d557460bebaa7cfe388157b627.tar.xz glibc-d063d164335938d557460bebaa7cfe388157b627.zip | |
Remove support for !USE___THREAD
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S | 76 |
1 files changed, 7 insertions, 69 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S index 2a1dad0695..5a24fdc2e7 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, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2011 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -32,12 +32,11 @@ .text ENTRY(__syscall_error) #ifndef PIC -# if USE___THREAD -# ifndef NOT_IN_libc -# define SYSCALL_ERROR_ERRNO __libc_errno -# else -# define SYSCALL_ERROR_ERRNO errno -# endif +# 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 @@ -46,34 +45,6 @@ ENTRY(__syscall_error) 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) - cfi_offset (%r15, -36) - cfi_offset (%r14, -40) - cfi_offset (%r13, -44) - lr %r0,%r15 - ahi %r15,-96 - cfi_adjust_cfa_offset (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) - cfi_adjust_cfa_offset (-96) - lhi %r2,-1 - br %r14 -1: .long __errno_location -#endif #else # if RTLD_PRIVATE_ERRNO basr %r1,0 @@ -83,7 +54,7 @@ ENTRY(__syscall_error) lhi %r2,-1 br %r14 1: .long rtld_errno - 0b -# elif USE___THREAD +# else # ifndef NOT_IN_libc # define SYSCALL_ERROR_ERRNO __libc_errno # else @@ -98,39 +69,6 @@ ENTRY(__syscall_error) 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) - cfi_offset (%r15, -36) - cfi_offset (%r14, -40) - cfi_offset (%r13, -44) - cfi_offset (%r12, -48) - cfi_offset (%r11, -52) - lr %r0,%r15 - ahi %r15,-96 - cfi_adjust_cfa_offset (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) - cfi_adjust_cfa_offset (-96) - lhi %r2,-1 - br %r14 -1: .long _GLOBAL_OFFSET_TABLE_-0b -2: .long __errno_location@PLT-0b # endif #endif |