aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/s390
diff options
context:
space:
mode:
authorAndreas Krebbel <krebbel@linux.vnet.ibm.com>2014-01-07 09:36:31 +0100
committerAndreas Krebbel <krebbel@linux.vnet.ibm.com>2014-01-07 09:36:31 +0100
commit93a45ff1ca6d459618bb0cf93580c4b2809a4b61 (patch)
tree01ba50a65134ba45d974f63156617392dabfd430 /sysdeps/s390
parentd5780febe69c2fe42d857e2feed54e9f4ba9ab87 (diff)
downloadglibc-93a45ff1ca6d459618bb0cf93580c4b2809a4b61.zip
glibc-93a45ff1ca6d459618bb0cf93580c4b2809a4b61.tar.gz
glibc-93a45ff1ca6d459618bb0cf93580c4b2809a4b61.tar.bz2
S/390: Make jmp_buf extendible.
Diffstat (limited to 'sysdeps/s390')
-rw-r--r--sysdeps/s390/Makefile5
-rw-r--r--sysdeps/s390/Versions11
-rw-r--r--sysdeps/s390/__longjmp.c31
-rw-r--r--sysdeps/s390/bits/setjmp.h4
-rw-r--r--sysdeps/s390/longjmp.c64
-rw-r--r--sysdeps/s390/rtld-__longjmp.c19
-rw-r--r--sysdeps/s390/rtld-setjmp.S20
-rw-r--r--sysdeps/s390/s390-32/__longjmp-common.c (renamed from sysdeps/s390/s390-32/__longjmp.c)2
-rw-r--r--sysdeps/s390/s390-32/setjmp-common.S (renamed from sysdeps/s390/s390-32/setjmp.S)24
-rw-r--r--sysdeps/s390/s390-64/__longjmp-common.c (renamed from sysdeps/s390/s390-64/__longjmp.c)2
-rw-r--r--sysdeps/s390/s390-64/setjmp-common.S (renamed from sysdeps/s390/s390-64/setjmp.S)16
-rw-r--r--sysdeps/s390/setjmp.S64
-rw-r--r--sysdeps/s390/sigjmp.c34
-rw-r--r--sysdeps/s390/v1-longjmp.c57
-rw-r--r--sysdeps/s390/v1-setjmp.h111
-rw-r--r--sysdeps/s390/v1-sigjmp.c44
16 files changed, 490 insertions, 18 deletions
diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile
new file mode 100644
index 0000000..fdc6ee5
--- /dev/null
+++ b/sysdeps/s390/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(subdir),setjmp)
+ifeq (yes,$(build-shared))
+sysdep_routines += v1-longjmp v1-sigjmp
+endif
+endif
diff --git a/sysdeps/s390/Versions b/sysdeps/s390/Versions
index baf9842..156abc7 100644
--- a/sysdeps/s390/Versions
+++ b/sysdeps/s390/Versions
@@ -1,3 +1,14 @@
+libc {
+ GLIBC_2.19 {
+ setjmp; _setjmp; __setjmp; __sigsetjmp;
+ longjmp; _longjmp; siglongjmp;
+ }
+ GLIBC_PRIVATE {
+ __v1__libc_longjmp; __v1__libc_siglongjmp;
+ __v2__libc_longjmp; __v2__libc_siglongjmp;
+ }
+}
+
ld {
GLIBC_2.3 {
# runtime interface to TLS
diff --git a/sysdeps/s390/__longjmp.c b/sysdeps/s390/__longjmp.c
new file mode 100644
index 0000000..e4acd31
--- /dev/null
+++ b/sysdeps/s390/__longjmp.c
@@ -0,0 +1,31 @@
+/* Copyright (C) 2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <libc-symbols.h>
+#include <shlib-compat.h>
+
+#define __longjmp __v2__longjmp
+#include "__longjmp-common.c"
+#undef __longjmp
+strong_alias (__v2__longjmp, __longjmp)
+
+#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19)
+# undef __longjmp
+# define __V1_JMPBUF
+# define __longjmp __v1__longjmp
+# include "__longjmp-common.c"
+#endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) */
diff --git a/sysdeps/s390/bits/setjmp.h b/sysdeps/s390/bits/setjmp.h
index 0071a9d..25eaf10 100644
--- a/sysdeps/s390/bits/setjmp.h
+++ b/sysdeps/s390/bits/setjmp.h
@@ -40,6 +40,10 @@ typedef struct __s390_jmp_buf
/* We save fpu registers 4 and 6. */
long __fpregs[4];
# endif
+#ifndef __V1_JMPBUF
+ unsigned long __flags;
+ char __reserved[128];
+#endif
} __jmp_buf[1];
#endif
diff --git a/sysdeps/s390/longjmp.c b/sysdeps/s390/longjmp.c
new file mode 100644
index 0000000..c758d14
--- /dev/null
+++ b/sysdeps/s390/longjmp.c
@@ -0,0 +1,64 @@
+/* Copyright (C) 2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>.
+
+ Versioned copy of sysdeps/generic/longjmp.c modified for extended
+ jmpbuf. */
+
+#include <shlib-compat.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <signal.h>
+
+extern void __v2__longjmp (__jmp_buf __env, int __val)
+ __attribute__ ((__noreturn__));
+extern void __v2__libc_longjmp (sigjmp_buf env, int val)
+ __attribute__ ((__noreturn__));
+libc_hidden_proto (__v2__libc_longjmp)
+
+/* Set the signal mask to the one specified in ENV, and jump
+ to the position specified in ENV, causing the setjmp
+ call there to return VAL, or 1 if VAL is 0. */
+void
+__v2__libc_siglongjmp (sigjmp_buf env, int val)
+{
+ /* Perform any cleanups needed by the frames being unwound. */
+ _longjmp_unwind (env, val);
+
+ if (env[0].__mask_was_saved)
+ /* Restore the saved signal mask. */
+ (void) __sigprocmask (SIG_SETMASK, &env[0].__saved_mask,
+ (sigset_t *) NULL);
+
+ /* Call the machine-dependent function to restore machine state. */
+ __v2__longjmp (env[0].__jmpbuf, val ?: 1);
+}
+
+#ifndef __v2__longjmp
+strong_alias (__v2__libc_siglongjmp, __v2__libc_longjmp)
+libc_hidden_def (__v2__libc_longjmp)
+weak_alias (__v2__libc_siglongjmp, __v2_longjmp)
+weak_alias (__v2__libc_siglongjmp, __v2longjmp)
+weak_alias (__v2__libc_siglongjmp, __v2siglongjmp)
+
+/* These will be used by libpthread only. */
+versioned_symbol (libc, __v2__libc_longjmp, __libc_longjmp, GLIBC_PRIVATE);
+versioned_symbol (libc, __v2__libc_siglongjmp, __libc_siglongjmp, GLIBC_PRIVATE);
+
+versioned_symbol (libc, __v2_longjmp, _longjmp, GLIBC_2_19);
+versioned_symbol (libc, __v2longjmp, longjmp, GLIBC_2_19);
+versioned_symbol (libc, __v2siglongjmp, siglongjmp, GLIBC_2_19);
+#endif /* ifndef __v2__longjmp */
diff --git a/sysdeps/s390/rtld-__longjmp.c b/sysdeps/s390/rtld-__longjmp.c
new file mode 100644
index 0000000..5e9f739
--- /dev/null
+++ b/sysdeps/s390/rtld-__longjmp.c
@@ -0,0 +1,19 @@
+/* Copyright (C) 2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+/* Build a non-versioned object for rtld-*. */
+# include "__longjmp-common.c"
diff --git a/sysdeps/s390/rtld-setjmp.S b/sysdeps/s390/rtld-setjmp.S
new file mode 100644
index 0000000..4011011
--- /dev/null
+++ b/sysdeps/s390/rtld-setjmp.S
@@ -0,0 +1,20 @@
+/* Extendible version of setjmp for System z
+ Copyright (C) 2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+/* Build a non-versioned object for rtld-*. */
+# include "setjmp-common.S"
diff --git a/sysdeps/s390/s390-32/__longjmp.c b/sysdeps/s390/s390-32/__longjmp-common.c
index 5d46e21..f78ef65 100644
--- a/sysdeps/s390/s390-32/__longjmp.c
+++ b/sysdeps/s390/s390-32/__longjmp-common.c
@@ -25,7 +25,7 @@
/* Jump to the position specified by ENV, causing the
setjmp call there to return VAL, or 1 if VAL is 0. */
-void
+attribute_hidden void
__longjmp (__jmp_buf env, int val)
{
#ifdef PTR_DEMANGLE
diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp-common.S
index b8a0296..d7bb720 100644
--- a/sysdeps/s390/s390-32/setjmp.S
+++ b/sysdeps/s390/s390-32/setjmp-common.S
@@ -27,24 +27,24 @@
ENTRY (setjmp)
.weak C_SYMBOL_NAME (setjmp)
lhi %r3,1 /* second argument of one */
- j .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */
+ j 0f /* branch relativ to __sigsetjmp */
END (setjmp)
/* Binary compatibility entry point. */
ENTRY(_setjmp)
.weak C_SYMBOL_NAME (_setjmp)
lhi %r3,0 /* second argument of zero */
- j .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */
+ j 0f /* branch relativ to __sigsetjmp */
END (_setjmp)
libc_hidden_def (_setjmp)
ENTRY(__setjmp)
lhi %r3,0 /* second argument of zero */
- j .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */
+ j 0f /* branch relativ to __sigsetjmp */
END (__setjmp)
ENTRY(__sigsetjmp)
-.Linternal_sigsetjmp:
+0:
#ifdef PTR_MANGLE
stm %r6,%r13,0(%r2) /* store registers in jmp_buf */
lr %r4,%r14
@@ -55,6 +55,10 @@ ENTRY(__sigsetjmp)
#else
stm %r6,%r15,0(%r2) /* store registers in jmp_buf */
#endif
+#ifndef __V1_JMPBUF
+ lhi %r4,0
+ st %r4,56(%r2) /* Set __flags to 0. */
+#endif
std %f4,40(%r2)
std %f6,48(%r2)
#if defined NOT_IN_libc && defined IS_IN_rtld
@@ -66,15 +70,15 @@ ENTRY(__sigsetjmp)
we can't save and restore our caller's value. Instead, we do an
indirect jump through the GOT. */
basr %r1,0
-.L0: al %r1,.L1 - .L0(0,%r1) /* get address of global offset table */
- /* get address of __sigjmp_save from got */
+0: al %r1,1f-0b(0,%r1) /* get address of global offset table */
+ /* get address of __sigjmp_save from got */
l %r1,__sigjmp_save@GOT12(0,%r1)
br %r1
-.L1: .long _GLOBAL_OFFSET_TABLE_ - .L0
+1: .long _GLOBAL_OFFSET_TABLE_ - 0b
#else
basr %r1,0
-.L0: l %r1,.L1-.L0(0,%r1) /* load address of __sigjmp_save */
- br %r1 /* tail-call __sigjmp_save */
-.L1: .long __sigjmp_save
+0: l %r1,1f-0b(0,%r1) /* load address of __sigjmp_save */
+ br %r1 /* tail-call __sigjmp_save */
+1: .long __sigjmp_save
#endif
END (__sigsetjmp)
diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp-common.c
index 168ebf5..46cabb6 100644
--- a/sysdeps/s390/s390-64/__longjmp.c
+++ b/sysdeps/s390/s390-64/__longjmp-common.c
@@ -25,7 +25,7 @@
/* Jump to the position specified by ENV, causing the
setjmp call there to return VAL, or 1 if VAL is 0. */
-void
+attribute_hidden void
__longjmp (__jmp_buf env, int val)
{
#ifdef PTR_DEMANGLE
diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp-common.S
index 5462dab..9cdcae4 100644
--- a/sysdeps/s390/s390-64/setjmp.S
+++ b/sysdeps/s390/s390-64/setjmp-common.S
@@ -27,24 +27,24 @@
ENTRY (setjmp)
.weak C_SYMBOL_NAME (setjmp)
lghi %r3,1 /* Second argument of one. */
- j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
+ j 0f /* Branch relativ to __sigsetjmp. */
END (setjmp)
/* Binary compatibility entry point. */
ENTRY(_setjmp)
.weak C_SYMBOL_NAME (_setjmp)
slgr %r3,%r3 /* Second argument of zero. */
- j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
-END (setjmp)
+ j 0f /* Branch relativ to __sigsetjmp. */
+END (_setjmp)
libc_hidden_def (_setjmp)
ENTRY(__setjmp)
slgr %r3,%r3 /* Second argument of zero. */
- j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
-END (setjmp)
+ j 0f /* Branch relativ to __sigsetjmp. */
+END (__setjmp)
ENTRY(__sigsetjmp)
-.Linternal_sigsetjmp:
+0:
#ifdef PTR_MANGLE
stmg %r6,%r13,0(%r2) /* Store registers in jmp_buf. */
lgr %r4,%r14
@@ -55,6 +55,10 @@ ENTRY(__sigsetjmp)
#else
stmg %r6,%r15,0(%r2) /* Store registers in jmp_buf. */
#endif
+#ifndef __V1_JMPBUF
+ lghi %r4,0
+ stg %r4,144(%r2) /* Set __flags to 0. */
+#endif
std %f8,80(%r2)
std %f9,88(%r2)
std %f10,96(%r2)
diff --git a/sysdeps/s390/setjmp.S b/sysdeps/s390/setjmp.S
new file mode 100644
index 0000000..2ec621a
--- /dev/null
+++ b/sysdeps/s390/setjmp.S
@@ -0,0 +1,64 @@
+/* Extendible version of setjmp for System z
+ Copyright (C) 2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <libc-symbols.h>
+#include <shlib-compat.h>
+
+versioned_symbol (libc, __v2setjmp, setjmp, GLIBC_2_19)
+versioned_symbol (libc, __v2_setjmp, _setjmp, GLIBC_2_19)
+versioned_symbol (libc, __v2__setjmp, __setjmp, GLIBC_2_19)
+versioned_symbol (libc, __v2__sigsetjmp, __sigsetjmp, GLIBC_2_19)
+#define setjmp __v2setjmp
+#define _setjmp __v2_setjmp
+#define __setjmp __v2__setjmp
+#define __sigsetjmp __v2__sigsetjmp
+#define __sigjmp_save __v2__sigjmp_save
+
+#include "setjmp-common.S"
+
+#undef setjmp
+#undef _setjmp
+#undef __setjmp
+#undef __sigsetjmp
+#undef __sigjmp_save
+libc_hidden_ver (__v2setjmp, setjmp)
+libc_hidden_ver (__v2_setjmp, _setjmp)
+libc_hidden_ver (__v2__setjmp, __setjmp)
+libc_hidden_ver (__v2__sigsetjmp, __sigsetjmp)
+
+#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19)
+compat_symbol (libc, __v1setjmp, setjmp, GLIBC_2_0)
+compat_symbol (libc, __v1_setjmp, _setjmp, GLIBC_2_0)
+compat_symbol (libc, __v1__setjmp, __setjmp, GLIBC_2_0)
+compat_symbol (libc, __v1__sigsetjmp, __sigsetjmp, GLIBC_2_0)
+# define setjmp __v1setjmp
+# define _setjmp __v1_setjmp
+# define __setjmp __v1__setjmp
+# define __sigsetjmp __v1__sigsetjmp
+# define __sigjmp_save __v1__sigjmp_save
+# define __V1_JMPBUF
+
+# include "setjmp-common.S"
+
+# undef setjmp
+# undef _setjmp
+# undef __setjmp
+# undef __sigsetjmp
+# undef __sigjmp_save
+
+#endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) */
diff --git a/sysdeps/s390/sigjmp.c b/sysdeps/s390/sigjmp.c
new file mode 100644
index 0000000..f7b5a6f
--- /dev/null
+++ b/sysdeps/s390/sigjmp.c
@@ -0,0 +1,34 @@
+/* Copyright (C) 1992-2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <stddef.h>
+#include <setjmp.h>
+#include <signal.h>
+
+/* This function is called by the `sigsetjmp' macro
+ before doing a `__setjmp' on ENV[0].__jmpbuf.
+ Always return zero. */
+
+int
+__v2__sigjmp_save (sigjmp_buf env, int savemask)
+{
+ env[0].__mask_was_saved = (savemask &&
+ __sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
+ &env[0].__saved_mask) == 0);
+
+ return 0;
+}
diff --git a/sysdeps/s390/v1-longjmp.c b/sysdeps/s390/v1-longjmp.c
new file mode 100644
index 0000000..82252c9
--- /dev/null
+++ b/sysdeps/s390/v1-longjmp.c
@@ -0,0 +1,57 @@
+/* Copyright (C) 2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>.
+
+ Versioned copy of sysdeps/generic/longjmp.c modified for extended
+ jmpbuf. */
+
+#include <shlib-compat.h>
+#include <stddef.h>
+#include <signal.h>
+#include "v1-setjmp.h"
+
+#if !defined NOT_INT_libc && defined SHARED
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19)
+
+void
+__v1__libc_siglongjmp (__v1__sigjmp_buf env, int val)
+{
+ /* Perform any cleanups needed by the frames being unwound. */
+ _longjmp_unwind (env, val);
+
+ if (env[0].__mask_was_saved)
+ /* Restore the saved signal mask. */
+ (void) __sigprocmask (SIG_SETMASK, &env[0].__saved_mask,
+ (sigset_t *) NULL);
+
+ /* Call the machine-dependent function to restore machine state. */
+ __v1__longjmp (env[0].__jmpbuf, val ?: 1);
+}
+
+# ifndef __v1__longjmp
+strong_alias (__v1__libc_siglongjmp, __v1__libc_longjmp)
+libc_hidden_def (__v1__libc_longjmp)
+weak_alias (__v1__libc_siglongjmp, __v1_longjmp)
+weak_alias (__v1__libc_siglongjmp, __v1longjmp)
+weak_alias (__v1__libc_siglongjmp, __v1siglongjmp)
+
+compat_symbol (libc, __v1_longjmp, _longjmp, GLIBC_2_0);
+compat_symbol (libc, __v1longjmp, longjmp, GLIBC_2_0);
+compat_symbol (libc, __v1siglongjmp, siglongjmp, GLIBC_2_0);
+
+# endif /* ifndef __v1__longjmp */
+# endif /* SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) */
+#endif /* if !defined NOT_INT_libc && defined SHARED */
diff --git a/sysdeps/s390/v1-setjmp.h b/sysdeps/s390/v1-setjmp.h
new file mode 100644
index 0000000..a4a6b76
--- /dev/null
+++ b/sysdeps/s390/v1-setjmp.h
@@ -0,0 +1,111 @@
+/* Copyright (C) 1991-2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+/*
+ * ISO C99 Standard: 7.13 Nonlocal jumps <setjmp.h>
+ */
+
+#ifndef _V1_SETJMP_H
+#define _V1_SETJMP_H 1
+
+#include <features.h>
+
+__BEGIN_DECLS
+
+#define __V1_JMPBUF
+#define _SETJMP_H
+#include <bits/setjmp.h> /* Get `__jmp_buf'. */
+
+#ifndef _ASM
+
+#include <bits/sigset.h> /* Get `__sigset_t'. */
+
+
+/* Calling environment, plus possibly a saved signal mask. */
+typedef struct __v1__jmp_buf_tag
+ {
+ /* NOTE: The machine-dependent definitions of `__sigsetjmp'
+ assume that a `jmp_buf' begins with a `__jmp_buf' and that
+ `__mask_was_saved' follows it. Do not move these members
+ or add others before it. */
+ __jmp_buf __jmpbuf; /* Calling environment. */
+ int __mask_was_saved; /* Saved the signal mask? */
+ __sigset_t __saved_mask; /* Saved signal mask. */
+ } __v1__jmp_buf[1];
+
+
+/* Store the calling environment in ENV, also saving the signal mask.
+ Return 0. */
+extern int __v1setjmp (__v1__jmp_buf __env);
+
+/* Store the calling environment in ENV, also saving the
+ signal mask if SAVEMASK is nonzero. Return 0.
+ This is the internal name for `sigsetjmp'. */
+extern int __v1__sigsetjmp (struct __v1__jmp_buf_tag __env[1],
+ int __savemask);
+
+/* Store the calling environment in ENV, not saving the signal mask.
+ Return 0. */
+extern int __v1_setjmp (struct __v1__jmp_buf_tag __env[1]);
+
+/* Jump to the environment saved in ENV, making the
+ `setjmp' call there return VAL, or 1 if VAL is 0. */
+extern void __v1longjmp (struct __v1__jmp_buf_tag __env[1], int __val)
+ __attribute__ ((__noreturn__));
+
+/* Same. Usually `_longjmp' is used with `_setjmp', which does not save
+ the signal mask. But it is how ENV was saved that determines whether
+ `longjmp' restores the mask; `_longjmp' is just an alias. */
+extern void __v1_longjmp (struct __v1__jmp_buf_tag __env[1], int __val)
+ __attribute__ ((__noreturn__));
+
+/* Use the same type for `jmp_buf' and `sigjmp_buf'.
+ The `__mask_was_saved' flag determines whether
+ or not `longjmp' will restore the signal mask. */
+typedef struct __v1__jmp_buf_tag __v1__sigjmp_buf[1];
+
+/* Jump to the environment saved in ENV, making the
+ sigsetjmp call there return VAL, or 1 if VAL is 0.
+ Restore the signal mask if that sigsetjmp call saved it.
+ This is just an alias `longjmp'. */
+extern void __v1siglongjmp (__v1__sigjmp_buf __env, int __val)
+ __attribute__ ((__noreturn__));
+
+/* Internal machine-dependent function to restore context sans signal mask. */
+extern void __v1__longjmp (__jmp_buf __env, int __val)
+ __attribute__ ((__noreturn__));
+
+/* Internal function to possibly save the current mask of blocked signals
+ in ENV, and always set the flag saying whether or not it was saved.
+ This is used by the machine-dependent definition of `__sigsetjmp'.
+ Always returns zero, for convenience. */
+extern int __v1__sigjmp_save (__v1__jmp_buf __env, int __savemask);
+
+extern void _longjmp_unwind (__v1__jmp_buf env, int val);
+
+extern void __v1__libc_siglongjmp (__v1__sigjmp_buf env, int val)
+ __attribute__ ((noreturn));
+
+extern void __v1__libc_longjmp (__v1__sigjmp_buf env, int val)
+ __attribute__ ((noreturn));
+
+libc_hidden_proto (__v1__libc_longjmp)
+libc_hidden_proto (__v1_setjmp)
+libc_hidden_proto (__v1__sigsetjmp)
+#endif /* !_ASM */
+
+#endif /* ifndef _V1_SETJMP_H */
diff --git a/sysdeps/s390/v1-sigjmp.c b/sysdeps/s390/v1-sigjmp.c
new file mode 100644
index 0000000..b624d16
--- /dev/null
+++ b/sysdeps/s390/v1-sigjmp.c
@@ -0,0 +1,44 @@
+/* Copyright (C) 1992-2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>.
+
+ Copied from setjmp/sigjmp.c for extending jmp_buf. */
+
+#include <bits/wordsize.h>
+#include <shlib-compat.h>
+
+#if !defined NOT_IN_libc && defined SHARED
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19)
+# include <stddef.h>
+# include <v1-setjmp.h>
+# include <signal.h>
+
+/* This function is called by the `sigsetjmp' macro
+ before doing a `__setjmp' on ENV[0].__jmpbuf.
+ Always return zero. */
+
+int
+__v1__sigjmp_save (__v1__sigjmp_buf env, int savemask)
+{
+ env[0].__mask_was_saved = (savemask &&
+ __sigprocmask (SIG_BLOCK, (sigset_t *) NULL,
+ &env[0].__saved_mask) == 0);
+
+ return 0;
+}
+
+# endif /* SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) */
+#endif /* !NOT_IN_libc && SHARED */