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.h | |
| parent | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (diff) | |
| download | glibc-d063d164335938d557460bebaa7cfe388157b627.tar.gz | |
Remove support for !USE___THREAD
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h index 13ce9ab748..435eaabb17 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 +/* Copyright (C) 2000, 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. @@ -56,10 +56,10 @@ #undef PSEUDO #define PSEUDO(name, syscall_name, args) \ .text; \ - ENTRY (name) \ + ENTRY (name) \ DO_CALL (syscall_name, args); \ lhi %r4,-4095 ; \ - clr %r2,%r4 ; \ + clr %r2,%r4 ; \ jnl SYSCALL_ERROR_LABEL #undef PSEUDO_END @@ -70,7 +70,7 @@ #undef PSEUDO_NOERRNO #define PSEUDO_NOERRNO(name, syscall_name, args) \ .text; \ - ENTRY (name) \ + ENTRY (name) \ DO_CALL (syscall_name, args) #undef PSEUDO_END_NOERRNO @@ -80,7 +80,7 @@ #undef PSEUDO_ERRVAL #define PSEUDO_ERRVAL(name, syscall_name, args) \ .text; \ - ENTRY (name) \ + ENTRY (name) \ DO_CALL (syscall_name, args); \ lcr %r2,%r2 @@ -107,14 +107,13 @@ br %r14; \ 2: .long rtld_errno-1b # 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; \ basr %r1,0; \ 1: al %r1,2f-1b(%r1); \ @@ -124,14 +123,6 @@ lhi %r2,-1; \ br %r14; \ 2: .long _GLOBAL_OFFSET_TABLE_-1b -# else -# define SYSCALL_ERROR_LABEL 0f -# define SYSCALL_ERROR_HANDLER \ -0: basr %r1,0; \ -1: al %r1,2f-1b(%r1); \ - br %r1; \ -2: .long syscall_error@plt-1b -# endif # else # define SYSCALL_ERROR_LABEL 0f # define SYSCALL_ERROR_HANDLER \ @@ -317,8 +308,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; \ |