Update.

	* sysdeps/unix/sysv/linux/alpha/syscalls.list (msgrcv, msgsnd):
	Make cancelable.
	* sysdeps/unix/sysv/linux/hppa/syscalls.list (msgrcv, msgsnd):
	Likewise.
	* sysdeps/unix/sysv/linux/ia64/syscalls.list (msgrcv, msgsnd):
	Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (msgrcv, msgsnd):
	Likewise.
	* sysdeps/unix/sysv/linux/x86_64/syscalls.list (msgrcv, msgsnd):
	Likewise.
	* sysdeps/unix/sysv/linux/ia64/sigsuspend.c (__sigsuspend): Likewise.

1 files changed, 118 insertions, 0 deletions

diff --git a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
new file mode 100644
index 0000000000..1c7a95dcd8
--- /dev/null
+++ b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
@@ -0,0 +1,118 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <sysdep.h>
+#include <tls.h>
+#include <pt-machine.h>
+#ifndef ASSEMBLER
+# include <linuxthreads/internals.h>
+#endif
+
+#if !defined NOT_IN_libc || defined IS_IN_libpthread
+
+# undef PSEUDO
+# define PSEUDO(name, syscall_name, args)				      \
+  .text;								      \
+  ENTRY (name)								      \
+    SINGLE_THREAD_P;							      \
+    jne L(pseudo_cancel);						      \
+    DO_CALL (syscall_name, args);					      \
+    cmpq $-4095, %rax;							      \
+    jae SYSCALL_ERROR_LABEL;						      \
+    ret;								      \
+  L(pseudo_cancel):							      \
+    SAVESTK_##args							      \
+    PUSHARGS_##args							      \
+    CENABLE								      \
+    POPARGS_##args							      \
+    movq %rax, OLDTYPE_##args;						      \
+    movq $SYS_ify (syscall_name), %rax;					      \
+    syscall;								      \
+    xchgq %rax, OLDTYPE_##args;						      \
+    CDISABLE								      \
+    movq OLDTYPE_##args, %rax;						      \
+    RESTSTK_##args							      \
+    cmpq $-4095, %rax;							      \
+    jae SYSCALL_ERROR_LABEL;						      \
+  L(pseudo_end):
+
+# define PUSHARGS_0	/* Nothing.  */
+# define PUSHARGS_1	PUSHARGS_0 movq %rdi, (%rsp);
+# define PUSHARGS_2	PUSHARGS_1 movq %rsi, 8(%rsp);
+# define PUSHARGS_3	PUSHARGS_2 movq %rdx, 16(%rsp);
+# define PUSHARGS_4	PUSHARGS_3 movq %rcx, 24(%rsp);
+# define PUSHARGS_5	PUSHARGS_4 movq %r8, 32(%rsp);
+# define PUSHARGS_6	PUSHARGS_5 movq %r9, 40(%rsp);
+
+# define POPARGS_0	/* Nothing.  */
+# define POPARGS_1	POPARGS_0 movq (%rsp), %rdi;
+# define POPARGS_2	POPARGS_1 movq 8(%rsp), %rsi;
+# define POPARGS_3	POPARGS_2 movq 16(%rsp), %rdx;
+# define POPARGS_4	POPARGS_3 movq 24(%rsp), %r10;
+# define POPARGS_5	POPARGS_4 movq 32(%rsp), %r8;
+# define POPARGS_6	POPARGS_5 movq 40(%rsp), %r9;
+
+# define SAVESTK_0	/* Nothing.  */
+# define SAVESTK_1	subq $16, %rsp;
+# define SAVESTK_2	SAVESTK_1;
+# define SAVESTK_3	subq $32, %rsp;
+# define SAVESTK_4	SAVESTK_3;
+# define SAVESTK_5	subq $48, %rsp;
+# define SAVESTK_6	subq $64, %rsp;
+
+# define RESTSTK_0	/* Nothing.  */
+# define RESTSTK_1	addq $16, %rsp;
+# define RESTSTK_2	RESTSTK_1;
+# define RESTSTK_3	addq $32, %rsp;
+# define RESTSTK_4	RESTSTK_3;
+# define RESTSTK_5	addq $48, %rsp;
+# define RESTSTK_6	addq $64, %rsp;
+
+# define OLDTYPE_0	%r9
+# define OLDTYPE_1	OLDTYPE_0
+# define OLDTYPE_2	OLDTYPE_0
+# define OLDTYPE_3	OLDTYPE_0
+# define OLDTYPE_4	OLDTYPE_0
+# define OLDTYPE_5	OLDTYPE_0
+# define OLDTYPE_6	48(%rsp)
+
+# ifdef IS_IN_libpthread
+#  define CENABLE	call __pthread_enable_asynccancel;
+#  define CDISABLE	call __pthread_disable_asynccancel;
+#  define __local_multiple_threads __pthread_multiple_threads
+# else
+#  define CENABLE	call __libc_enable_asynccancel;
+#  define CDISABLE	call __libc_disable_asynccancel;
+#  define __local_multiple_threads __libc_multiple_threads
+# endif
+
+# ifndef ASSEMBLER
+extern int __local_multiple_threads attribute_hidden;
+#   define SINGLE_THREAD_P \
+  __builtin_expect (__local_multiple_threads == 0, 1)
+# else
+#  define SINGLE_THREAD_P cmpl $0, __local_multiple_threads(%rip)
+# endif
+
+#elif !defined ASSEMBLER
+
+/* This code should never be used but we define it anyhow.  */
+# define SINGLE_THREAD_P (1)
+
+#endif