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-64 | |
| parent | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (diff) | |
| download | glibc-d063d164335938d557460bebaa7cfe388157b627.tar glibc-d063d164335938d557460bebaa7cfe388157b627.tar.gz glibc-d063d164335938d557460bebaa7cfe388157b627.tar.bz2 glibc-d063d164335938d557460bebaa7cfe388157b627.zip | |
Remove support for !USE___THREAD
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/s390-64')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S | 61 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 25 |
2 files changed, 17 insertions, 69 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S index bb61e894f1..41d8143896 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 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. @@ -33,12 +33,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: lg %r1,1f-0b(%r1) ear %r3,%a0 @@ -49,29 +48,6 @@ ENTRY(__syscall_error) lghi %r2,-1 br %r14 1: .quad SYSCALL_ERROR_ERRNO@ntpoff -# elif !defined _LIBC_REENTRANT - larl %r1,errno - lcr %r2,%r2 - st %r2,0(%r1) - lghi %r2,-1 - br %r14 -# else - stmg %r13,%r15,104(%r15) - cfi_offset (%r15,-40) - cfi_offset (%r14,-48) - cfi_offset (%r13,-56) - lgr %r0,%r15 - aghi %r15,-160 - cfi_adjust_cfa_offset (160) - lcr %r13,%r2 - stg %r0,0(%r15) - brasl %r14,__errno_location - st %r13,0(%r2) - lmg %r13,%r15,264(%r15) - cfi_adjust_cfa_offset (-160) - lghi %r2,-1 - br %r14 -#endif #else # if RTLD_PRIVATE_ERRNO larl %r1,rtld_errno @@ -79,7 +55,7 @@ ENTRY(__syscall_error) st %r2,0(%r1) lghi %r2,-1 br %r14 -# elif USE___THREAD +# else # ifndef NOT_IN_libc # define SYSCALL_ERROR_ERRNO __libc_errno # else @@ -94,29 +70,6 @@ ENTRY(__syscall_error) st %r2,0(%r1,%r3) lghi %r2,-1 br %r14 -# elif !defined _LIBC_REENTRANT - larl %r1,_GLOBAL_OFFSET_TABLE_ - lg %r1,errno@GOT(%r1) - lcr %r2,%r2 - st %r2,0(%r1) - lghi %r2,-1 - br %r14 -# else - stmg %r13,%r15,104(%r15) - cfi_offset (%r15,-40) - cfi_offset (%r14,-48) - cfi_offset (%r13,-56) - lgr %r0,%r15 - aghi %r15,-160 - cfi_adjust_cfa_offset (160) - lcr %r13,%r2 - stg %r0,0(%r15) - brasl %r14,__errno_location@PLT - st %r13,0(%r2) - lmg %r13,%r15,264(%r15) - cfi_adjust_cfa_offset (-160) - lghi %r2,-1 - br %r14 # endif #endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h index 4d45417639..598fb86529 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h @@ -1,5 +1,5 @@ /* Assembler macros for 64 bit S/390. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2011 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -115,14 +115,13 @@ lghi %r2,-1; \ br %r14 # elif defined _LIBC_REENTRANT -# if USE___THREAD -# ifndef NOT_IN_libc -# define SYSCALL_ERROR_ERRNO __libc_errno -# else -# define SYSCALL_ERROR_ERRNO errno -# endif -# define SYSCALL_ERROR_LABEL 0f -# define SYSCALL_ERROR_HANDLER \ +# ifndef NOT_IN_libc +# define SYSCALL_ERROR_ERRNO __libc_errno +# else +# define SYSCALL_ERROR_ERRNO errno +# endif +# define SYSCALL_ERROR_LABEL 0f +# define SYSCALL_ERROR_HANDLER \ 0: lcr %r0,%r2; \ larl %r1,SYSCALL_ERROR_ERRNO@indntpoff; \ lg %r1,0(%r1); \ @@ -132,10 +131,6 @@ st %r0,0(%r1,%r2); \ lghi %r2,-1; \ br %r14 -# else -# define SYSCALL_ERROR_LABEL syscall_error@plt -# define SYSCALL_ERROR_HANDLER -# endif # else # define SYSCALL_ERROR_LABEL 0f # define SYSCALL_ERROR_HANDLER \ @@ -319,8 +314,8 @@ if (INTERNAL_SYSCALL_ERROR_P (_ret, )) \ { \ iserr: \ - __set_errno (INTERNAL_SYSCALL_ERRNO (_ret, )); \ - _ret = -1L; \ + __set_errno (INTERNAL_SYSCALL_ERRNO (_ret, )); \ + _ret = -1L; \ } \ out: \ (int) _ret; \ |