diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/socket.S | 41 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c | 15 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/socket.S | 31 |
3 files changed, 79 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/socket.S b/sysdeps/unix/sysv/linux/s390/s390-32/socket.S index 366b655e56..c4eb2cab0b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/socket.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/socket.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -17,7 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <sysdep.h> +#include <sysdep-cancel.h> #include <socketcall.h> /* &%/$&!! preprocessor */ @@ -73,6 +73,12 @@ ENTRY(__socket) st %r3,0x64(0,%r15) /* store into parameter list */ st %r2,0x60(0,%r15) #endif + +#if defined NEED_CANCELLATION && defined CENABLE + SINGLE_THREAD_P (%r4) + jne L(socket_cancel) +#endif + /* load subcode for socket syscall */ lhi %r2,P(SOCKOP_,socket) la %r3,0x60(0,%r15) /* load address of parameter list */ @@ -80,6 +86,7 @@ ENTRY(__socket) /* Do the system call trap. */ svc SYS_ify(socketcall) +4: l %r15,0(0,%r15) /* load back chain */ lm %r6,15,24(%r15) /* load registers */ @@ -91,7 +98,35 @@ ENTRY(__socket) /* Successful; return the syscall's value. */ br %r14 -PSEUDO_END (__socket) +#if defined NEED_CANCELLATION && defined CENABLE +L(socket_cancel): + basr %r13,0 +1: l %r1,2f-1b(%r13) + /* call CENABLE. */ + bas %r14,0(%r13,%r1) + lr %r0,%r2 + + /* load subcode for socket syscall */ + lhi %r2,P(SOCKOP_,socket) + la %r3,0x60(0,%r15) /* load address of parameter list */ + + /* Do the system call trap. */ + svc SYS_ify(socketcall) + + l %r3,3f-1b(%r13) + lr %r12,%r2 + lr %r2,%r0 + /* call CDISABLE. */ + bas %r14,0(%r13,%r3) + lr %r2,%r12 + j 4b + +2: .long CENABLE-1b +3: .long CDISABLE-1b +#endif + + SYSCALL_ERROR_HANDLER +END (__socket) #ifndef NO_WEAK_ALIAS weak_alias (__socket, socket) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c b/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c index 4fa30ec3c8..f5e8de3160 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sigsuspend.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #include <signal.h> #include <unistd.h> -#include <sysdep.h> +#include <sysdep-cancel.h> #include <sys/syscall.h> extern int __syscall_rt_sigsuspend (const sigset_t *, size_t); @@ -34,7 +34,16 @@ __sigsuspend (set) { /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ - return INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8); + if (SINGLE_THREAD_P) + return INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = INLINE_SYSCALL (rt_sigsuspend, 2, set, _NSIG / 8); + + LIBC_CANCEL_RESET (oldtype); + + return result; } libc_hidden_def (__sigsuspend) weak_alias (__sigsuspend, sigsuspend) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/socket.S b/sysdeps/unix/sysv/linux/s390/s390-64/socket.S index 405802f61f..c9bd02baee 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/socket.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/socket.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2003 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -17,7 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <sysdep.h> +#include <sysdep-cancel.h> #include <socketcall.h> /* &%/$&!! preprocessor */ @@ -73,6 +73,12 @@ ENTRY(__socket) stg %r3,168(%r15) /* Store into parameter list. */ stg %r2,160(%r15) #endif + +#if defined NEED_CANCELLATION && defined CENABLE + SINGLE_THREAD_P + jne L(socket_cancel) +#endif + /* Load subcode for socket syscall. */ lghi %r2,P(SOCKOP_,socket) la %r3,160(%r15) /* Load address of parameter list. */ @@ -80,6 +86,7 @@ ENTRY(__socket) /* Do the system call trap. */ svc SYS_ify(socketcall) +4: lg %r15,0(%r15) /* Load back chain. */ lmg %r6,15,48(%r15) /* Load registers. */ @@ -91,6 +98,26 @@ ENTRY(__socket) /* Successful; return the syscall's value. */ br %r14 +#if defined NEED_CANCELLATION && defined CENABLE +L(socket_cancel): + brasl %r14,CENABLE + lr %r0,%r2 + + /* Load subcode for socket syscall. */ + lghi %r2,P(SOCKOP_,socket) + la %r3,160(%r15) /* Load address of parameter list. */ + + /* Do the system call trap. */ + svc SYS_ify(socketcall) + + lgr %r12,%r2 + lr %r2,%r0 + brasl %r14,CDISABLE + + lgr %r2,%r12 + j 4b +#endif + PSEUDO_END (__socket) #ifndef NO_WEAK_ALIAS |