Update.

2001-04-04  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/s390/s390-64/Dist: Add ucontext_i.h.
	* sysdeps/unix/sysv/linux/s390/s390-32/Dist: Likewise.

2001-04-04  Martin Schwidefsky  <schwidefsky@de.ibm.com>

	* sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/setcontext.S: New file.
	* sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h: New file.
	* sysdeps/unix/sysv/linux/s390/swapcontext.c: New file.

	* sunrpc/rpc_scan.c (symbols): Add entry for HYPER.
	* sunrpc/rpc_scan.h (enum tok_kind): Add TOK_HYPER.
	* sunrpc/rpc_parse.c (get_type): Handle TOK_HYPER.
	(unsigned_dec): Likewise.
	Patch by atai@jezebel.dreamhost.com.

14 files changed, 621 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d90d28a6c0..f2095f772e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-04-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/s390/s390-64/Dist: Add ucontext_i.h.
+	* sysdeps/unix/sysv/linux/s390/s390-32/Dist: Likewise.
+
+2001-04-04  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S: New file.
+	* sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c: New file.
+	* sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S: New file.
+	* sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h: New file.
+	* sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S: New file.
+	* sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c: New file.
+	* sysdeps/unix/sysv/linux/s390/s390-64/setcontext.S: New file.
+	* sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h: New file.
+	* sysdeps/unix/sysv/linux/s390/swapcontext.c: New file.
+
 2001-04-04  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/powerpc/dl-machine.h (ELF_MACHINE_NO_REL): Move to right
@@ -5,6 +22,12 @@
 
 2001-04-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* sunrpc/rpc_scan.c (symbols): Add entry for HYPER.
+	* sunrpc/rpc_scan.h (enum tok_kind): Add TOK_HYPER.
+	* sunrpc/rpc_parse.c (get_type): Handle TOK_HYPER.
+	(unsigned_dec): Likewise.
+	Patch by atai@jezebel.dreamhost.com.
+
 	* nis/nss_nis/nis-service.c (_nss_nis_getservbyname_r): Pass
 	pointer to int as last parameter of yp_match.
 	Patch by kanazawa@flab.fujitsu.co.jp.
diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
index e6c4e4a7aa..b036aa456d 100644
--- a/sunrpc/rpc_parse.c
+++ b/sunrpc/rpc_parse.c
@@ -621,6 +621,10 @@ get_type (const char **prefixp, const char **typep, defkind dkind)
       *typep = "long";
       (void) peekscan (TOK_INT, &tok);
       break;
+	case TOK_HYPER:
+	  *typep = "int64_t";
+      (void) peekscan(TOK_INT, &tok);
+	  break;    
     case TOK_VOID:
       if (dkind != DEF_UNION && dkind != DEF_PROGRAM)
 	{
@@ -664,6 +668,11 @@ unsigned_dec (const char **typep)
       *typep = "u_long";
       (void) peekscan (TOK_INT, &tok);
       break;
+	case TOK_HYPER:
+      get_token (&tok);
+	  *typep = "uint64_t";
+      (void) peekscan(TOK_INT, &tok);
+	  break;    
     case TOK_INT:
       get_token (&tok);
       *typep = "u_int";
diff --git a/sunrpc/rpc_scan.h b/sunrpc/rpc_scan.h
index 2f0d586682..74d77b0fbb 100644
--- a/sunrpc/rpc_scan.h
+++ b/sunrpc/rpc_scan.h
@@ -65,6 +65,7 @@ enum tok_kind {
 	TOK_INT,
 	TOK_SHORT,
 	TOK_LONG,
+	TOK_HYPER,
 	TOK_UNSIGNED,
 	TOK_FLOAT,
 	TOK_DOUBLE,
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Dist b/sysdeps/unix/sysv/linux/s390/s390-32/Dist
index 8023618720..beebff1d92 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/Dist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/Dist
@@ -5,3 +5,4 @@ setresgid.c
 setfsuid.c
 setfsgid.c
 sys/procfs.h
+ucontext_i.h
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S b/sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S
new file mode 100644
index 0000000000..e64cc8588c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S
@@ -0,0 +1,72 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include <sysdep.h>
+#include <features.h>
+
+#include "ucontext_i.h"
+
+/*  __getcontext (const ucontext_t *ucp)
+
+  Saves the machine context in UCP such that when it is activated,
+  it appears as if __getcontext() returned again.  The only difference
+  is that on a first return, %r2 contains 1 and on a subsequent
+  return, it contains 0.
+
+  This implementation is intended to be used for *synchronous* context
+  switches only.  Therefore, it does not have to save anything
+  other than the PRESERVED state.  */
+
+ENTRY(__getcontext)
+	lr      %r5,%r2
+
+	/* sigprocmask (SIG_BLOCK, NULL, &sc->sc_mask).  */
+	la      %r2,SIG_BLOCK
+	slr	%r3,%r3
+	la	%r4,SC_MASK(%r5)
+	svc	SYS_ify(rt_sigprocmask)
+
+	/* Store fpu context.  */
+	stfpc   SC_FPC(%r5)
+	std     %f0,SC_FPRS(%r5)
+	std     %f1,SC_FPRS+8(%r5)
+	std     %f2,SC_FPRS+16(%r5)
+	std     %f3,SC_FPRS+24(%r5)
+	std     %f4,SC_FPRS+32(%r5)
+	std     %f5,SC_FPRS+40(%r5)
+	std     %f6,SC_FPRS+48(%r5)
+	std     %f7,SC_FPRS+56(%r5)
+	std     %f8,SC_FPRS+64(%r5)
+	std     %f9,SC_FPRS+72(%r5)
+	std     %f10,SC_FPRS+80(%r5)
+	std     %f11,SC_FPRS+88(%r5)
+	std     %f12,SC_FPRS+96(%r5)
+	std     %f13,SC_FPRS+104(%r5)
+	std     %f14,SC_FPRS+112(%r5)
+	std     %f15,SC_FPRS+120(%r5)
+
+	/* Store general purpose registers.  */
+	stm     %r0,%r15,SC_GPRS(%r5)
+
+	/* Return 0.  */
+	slr	%r2,%r2
+	br	%r14
+END(__getcontext)
+
+weak_alias(__getcontext, getcontext)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c b/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c
new file mode 100644
index 0000000000..41ae5ad602
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/makecontext.c
@@ -0,0 +1,101 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <libintl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ucontext.h>
+
+/* This implementation can handle any ARGC value but only
+   normal integer type parameters. Parameters of type float,
+   double, complex and structure with sizes 0, 2, 4 or 8
+   won't work.
+   makecontext sets up a stack and the registers for the
+   context. The stack looks like this:
+           size                         offset
+    %r15 ->    +-----------------------+
+             4 | back chain (zero)     |  0
+             4 | reserved              |  4
+            88 | save area for (*func) |  8
+               +-----------------------+
+             n | overflow parameters   | 96
+               +-----------------------+
+             8 | trampoline            | 96+n
+               +-----------------------+
+   The registers are set up like this:
+     %r2-%r6: parameters 1 to 5
+     %r7    : (*func) pointer
+     %r8    : uc_link from ucontext structure
+     %r9    : address of setcontext
+     %r14   : return address to uc_link trampoline
+     %r15   : stack pointer.
+
+   The trampoline looks like this:
+     basr  %r14,%r7
+     lr    %r2,%r8
+     br    %r9.  */
+
+void
+__makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
+{
+  unsigned long *sp;
+  va_list ap;
+  int i;
+
+  sp = (long *) (((long) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & -8L);
+
+  /* Setup the trampoline.  */
+  *--sp = 0x07f90000;
+  *--sp = 0x0de71828;
+
+  /* Set the return address to trampoline.  */
+  ucp->uc_mcontext.gregs[14] = (long) sp;
+
+  /* Set register parameters.  */
+  va_start (ap, argc);
+  for (i = 0; (i < argc) && (i < 5); i++)
+    ucp->uc_mcontext.gregs[2+i] = va_arg (ap, long);
+
+  /* The remaining arguments go to the overflow area.  */
+  if (argc > 5) {
+    sp -= argc - 5;
+    for (i = 5; i < argc; i++)
+      sp[i] = va_arg(ap, long);
+  }
+  va_end (ap);
+
+  /* Make room for the save area and set the backchain.  */
+  sp -= 24;
+  *sp = 0;
+
+  /* Pass (*func) to __start_context in %r7.  */
+  ucp->uc_mcontext.gregs[7] = (long) func;
+
+  /* Pass ucp->uc_link to __start_context in %r8.  */
+  ucp->uc_mcontext.gregs[8] = (long) ucp->uc_link;
+
+  /* Pass address of setcontext in %r9.  */
+  ucp->uc_mcontext.gregs[9] = (long) &setcontext;
+
+  /* Set stack pointer.  */
+  ucp->uc_mcontext.gregs[15] = (long) sp;
+}
+
+weak_alias (__makecontext, makecontext)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S b/sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S
new file mode 100644
index 0000000000..40adc8574a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/setcontext.S
@@ -0,0 +1,70 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include <sysdep.h>
+#include <features.h>
+
+#include "ucontext_i.h"
+
+/*  __setcontext (const ucontext_t *ucp)
+
+  Restores the machine context in UCP and thereby resumes execution
+  in that context.
+
+  This implementation is intended to be used for *synchronous* context
+  switches only.  Therefore, it does not have to restore anything
+  other than the PRESERVED state.  */
+
+ENTRY(__setcontext)
+	lr	%r5,%r2
+
+	/* sigprocmask (SIG_SETMASK, &sc->sc_mask, NULL).  */
+	la      %r2,SIG_BLOCK
+	la	%r3,SC_MASK(%r5)
+	slr	%r4,%r4
+	svc	SYS_ify(rt_sigprocmask)
+
+	/* Load fpu context.  */
+	lfpc	SC_FPC(%r5)
+	ld	%f0,SC_FPRS(%r5)
+	ld      %f1,SC_FPRS+8(%r5)
+	ld      %f2,SC_FPRS+16(%r5)
+	ld      %f3,SC_FPRS+24(%r5)
+	ld      %f4,SC_FPRS+32(%r5)
+	ld      %f5,SC_FPRS+40(%r5)
+	ld      %f6,SC_FPRS+48(%r5)
+	ld      %f7,SC_FPRS+56(%r5)
+	ld      %f8,SC_FPRS+64(%r5)
+	ld      %f9,SC_FPRS+72(%r5)
+	ld      %f10,SC_FPRS+80(%r5)
+	ld      %f11,SC_FPRS+88(%r5)
+	ld      %f12,SC_FPRS+96(%r5)
+	ld      %f13,SC_FPRS+104(%r5)
+	ld      %f14,SC_FPRS+112(%r5)
+	ld      %f15,SC_FPRS+120(%r5)
+ 
+	/* Load general purpose registers.  */
+	lm	%r0,%r15,SC_GPRS(%r5)
+
+        /* Return 1.  */
+	la      %r2,1
+	br	%r14
+END(__setcontext)
+
+weak_alias(__setcontext, setcontext)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h b/sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h
new file mode 100644
index 0000000000..926a805dd0
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/ucontext_i.h
@@ -0,0 +1,34 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+     Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Constants shared between setcontext() and getcontext().  Don't
+   install this header file.  */
+
+#define SIG_BLOCK	0
+#define SIG_UNBLOCK	1
+#define SIG_SETMASK	2
+
+#define SC_FLGS 0x000
+#define SC_LINK 0x004
+#define SC_MASK 0x008
+#define SC_STCK 0x088
+#define SC_VERS 0x098
+#define SC_GPRS 0x09c
+#define SC_FPC  0x130
+#define SC_FPRS 0x138
+
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/Dist b/sysdeps/unix/sysv/linux/s390/s390-64/Dist
index 35d4f03c97..38ff6d7daa 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/Dist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/Dist
@@ -1,3 +1,4 @@
 clone.S
 kernel_stat.h
 sys/procfs.h
+ucontext_i.h
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S b/sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S
new file mode 100644
index 0000000000..2fc21e2b60
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S
@@ -0,0 +1,72 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include <sysdep.h>
+#include <features.h>
+
+#include "ucontext_i.h"
+
+/*  __getcontext (const ucontext_t *ucp)
+
+  Saves the machine context in UCP such that when it is activated,
+  it appears as if __getcontext() returned again.  The only difference
+  is that on a first return, %r2 contains 1 and on a subsequent
+  return, it contains 0.
+
+  This implementation is intended to be used for *synchronous* context
+  switches only.  Therefore, it does not have to save anything
+  other than the PRESERVED state.  */
+
+ENTRY(__getcontext)
+	lgr     %r5,%r2
+
+	/* sigprocmask (SIG_BLOCK, NULL, &sc->sc_mask).  */
+	la      %r2,SIG_BLOCK
+	slr	%r3,%r3
+	la	%r4,SC_MASK(%r5)
+	svc	SYS_ify(rt_sigprocmask)
+
+	/* Store fpu context.  */
+	stfpc   SC_FPC(%r5)
+	std     %f0,SC_FPRS(%r5)
+	std     %f1,SC_FPRS+8(%r5)
+	std     %f2,SC_FPRS+16(%r5)
+	std     %f3,SC_FPRS+24(%r5)
+	std     %f4,SC_FPRS+32(%r5)
+	std     %f5,SC_FPRS+40(%r5)
+	std     %f6,SC_FPRS+48(%r5)
+	std     %f7,SC_FPRS+56(%r5)
+	std     %f8,SC_FPRS+64(%r5)
+	std     %f9,SC_FPRS+72(%r5)
+	std     %f10,SC_FPRS+80(%r5)
+	std     %f11,SC_FPRS+88(%r5)
+	std     %f12,SC_FPRS+96(%r5)
+	std     %f13,SC_FPRS+104(%r5)
+	std     %f14,SC_FPRS+112(%r5)
+	std     %f15,SC_FPRS+120(%r5)
+
+	/* Store general purpose registers.  */
+	stmg    %r0,%r15,SC_GPRS(%r5)
+
+	/* Return 0.  */
+	slgr	%r2,%r2
+	br	%r14
+END(__getcontext)
+
+weak_alias(__getcontext, getcontext)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c b/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c
new file mode 100644
index 0000000000..6e0478cf0e
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/makecontext.c
@@ -0,0 +1,100 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <libintl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ucontext.h>
+
+/* This implementation can handle any ARGC value but only
+   normal integer type parameters. Parameters of type float,
+   double, complex and structure with sizes 0, 2, 4 or 8
+   won't work.
+   makecontext sets up a stack and the registers for the
+   user context. The stack looks like this:
+           size                         offset
+    %r15 ->    +-----------------------+
+             8 | back chain (zero)     |  0
+             8 | reserved              |  8
+           144 | save area for (*func) | 16
+               +-----------------------+
+             n | overflow parameters   | 160
+               +-----------------------+
+             8 | trampoline            | 160+n
+               +-----------------------+
+   The registers are set up like this:
+     %r2-%r6: parameters 1 to 5
+     %r7    : (*func) pointer
+     %r8    : uc_link from ucontext structure
+     %r9    : address of setcontext
+     %r14   : return address to uc_link trampoline
+     %r15   : stack pointer.
+
+   The trampoline looks like this:
+     basr  %r14,%r7
+     lgr   %r2,%r8
+     br    %r9.  */
+
+void
+__makecontext (ucontext_t *ucp, void (*func) (void), int argc, ...)
+{
+  unsigned long *sp;
+  va_list ap;
+  int i;
+
+  sp = (long *) (((long) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) & -8L);
+
+  /* Setup the trampoline.  */
+  *--sp = 0x0de7b904002807f9;
+
+  /* Set the return address to trampoline.  */
+  ucp->uc_mcontext.gregs[14] = (long) sp;
+
+  /* Set register parameters.  */
+  va_start (ap, argc);
+  for (i = 0; (i < argc) && (i < 5); i++)
+    ucp->uc_mcontext.gregs[2+i] = va_arg (ap, long);
+
+  /* The remaining arguments go to the overflow area.  */
+  if (argc > 5) {
+    sp -= argc - 5;
+    for (i = 5; i < argc; i++)
+      sp[i] = va_arg(ap, long);
+  }
+  va_end (ap);
+
+  /* Make room for the save area and set the backchain.  */
+  sp -= 20;
+  *sp = 0;
+
+  /* Pass (*func) to __start_context in %r7.  */
+  ucp->uc_mcontext.gregs[7] = (long) func;
+
+  /* Pass ucp->uc_link to __start_context in %r8.  */
+  ucp->uc_mcontext.gregs[8] = (long) ucp->uc_link;
+
+  /* Pass address of setcontext in %r9.  */
+  ucp->uc_mcontext.gregs[9] = (long) &setcontext;
+
+  /* Set stack pointer.  */
+  ucp->uc_mcontext.gregs[15] = (long) sp;
+}
+
+weak_alias (__makecontext, makecontext)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/setcontext.S b/sysdeps/unix/sysv/linux/s390/s390-64/setcontext.S
new file mode 100644
index 0000000000..b3a9fea405
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/setcontext.S
@@ -0,0 +1,70 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#include <sysdep.h>
+#include <features.h>
+
+#include "ucontext_i.h"
+
+/*  __setcontext (const ucontext_t *ucp)
+
+  Restores the machine context in UCP and thereby resumes execution
+  in that context.
+
+  This implementation is intended to be used for *synchronous* context
+  switches only.  Therefore, it does not have to restore anything
+  other than the PRESERVED state.  */
+
+ENTRY(__setcontext)
+	lgr	%r5,%r2
+
+	/* sigprocmask (SIG_SETMASK, &sc->sc_mask, NULL).  */
+	la      %r2,SIG_BLOCK
+	la	%r3,SC_MASK(%r5)
+	slgr	%r4,%r4
+	svc	SYS_ify(rt_sigprocmask)
+
+	/* Load fpu context.  */
+	lfpc	SC_FPC(%r5)
+	ld	%f0,SC_FPRS(%r5)
+	ld      %f1,SC_FPRS+8(%r5)
+	ld      %f2,SC_FPRS+16(%r5)
+	ld      %f3,SC_FPRS+24(%r5)
+	ld      %f4,SC_FPRS+32(%r5)
+	ld      %f5,SC_FPRS+40(%r5)
+	ld      %f6,SC_FPRS+48(%r5)
+	ld      %f7,SC_FPRS+56(%r5)
+	ld      %f8,SC_FPRS+64(%r5)
+	ld      %f9,SC_FPRS+72(%r5)
+	ld      %f10,SC_FPRS+80(%r5)
+	ld      %f11,SC_FPRS+88(%r5)
+	ld      %f12,SC_FPRS+96(%r5)
+	ld      %f13,SC_FPRS+104(%r5)
+	ld      %f14,SC_FPRS+112(%r5)
+	ld      %f15,SC_FPRS+120(%r5)
+ 
+	/* Load general purpose registers.  */
+	lmg	%r0,%r15,SC_GPRS(%r5)
+
+        /* Return 1.  */
+	la      %r2,1
+	br	%r14
+END(__setcontext)
+
+weak_alias(__setcontext, setcontext)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h b/sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h
new file mode 100644
index 0000000000..a7081141bd
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/ucontext_i.h
@@ -0,0 +1,34 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+     Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If
+   not, write to the Free Software Foundation, Inc.,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Constants shared between setcontext() and getcontext().  Don't
+   install this header file.  */
+
+#define SIG_BLOCK	0
+#define SIG_UNBLOCK	1
+#define SIG_SETMASK	2
+
+#define SC_FLGS 0x000
+#define SC_LINK 0x008
+#define SC_MASK 0x010
+#define SC_STCK 0x090
+#define SC_VERS 0x0a8
+#define SC_GPRS 0x0b0
+#define SC_FPC  0x188
+#define SC_FPRS 0x190
+
diff --git a/sysdeps/unix/sysv/linux/s390/swapcontext.c b/sysdeps/unix/sysv/linux/s390/swapcontext.c
new file mode 100644
index 0000000000..9f1be058db
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/swapcontext.c
@@ -0,0 +1,33 @@
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <ucontext.h>
+
+extern int __getcontext (ucontext_t *__ucp) __THROW;
+extern int __setcontext (__const ucontext_t *__ucp) __THROW;
+
+int
+__swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
+{
+  if (__getcontext (oucp) == 0)
+    __setcontext (ucp);
+  return 0;
+}
+
+weak_alias (__swapcontext, swapcontext)