diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390')
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/clone.S | 17 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/clone.S | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S | 3 |
4 files changed, 8 insertions, 23 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S index f01433ff0f..442045bf21 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). @@ -59,18 +59,5 @@ thread_start: ahi %r15,-96 /* make room on the stack for the save area */ xc 0(4,%r15),0(%r15) basr %r14,%r1 /* jump to fn */ -#ifdef PIC - basr %r12,0 -.L0: lr %r1,%r12 - al %r12,.L1-.L0(%r12) - al %r1,.L2-.L0(%r1) - br %r1 /* branch to _exit -> thread termination */ -.L1: .long _GLOBAL_OFFSET_TABLE_ - .L0 -.L2: .long _exit@PLT - .L0 -#else - basr %r1,0 -.L0: al %r1,.L1-.L0(0,%r1) - br %r1 /* branch to _exit -> thread termination */ -.L1: .long _exit - .L0 -#endif + DO_CALL (exit, 1) weak_alias (__clone, clone) diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S index b1f17335f7..1aad4ab164 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include <sysdep.h> +#include <tls.h> /* The following code is only used in the shared library when we compile the reentrant version. Otherwise each system call defines diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S index f70bd15260..724ca611ec 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S @@ -1,5 +1,5 @@ /* Wrapper around clone system call. 64 bit S/390 version. - Copyright (C) 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -60,9 +60,5 @@ thread_start: aghi %r15,-160 /* make room on the stack for the save area */ xc 0(8,%r15),0(%r15) basr %r14,%r1 /* jump to fn */ -#ifdef PIC - jg _exit@PLT /* branch to _exit -> thread termination */ -#else - jg _exit /* branch to _exit -> thread termination */ -#endif + DO_CALL (exit, 1) weak_alias (__clone, clone) diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S index ce1f03e006..4299257afa 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S +++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include <sysdep.h> +#include <tls.h> /* The following code is only used in the shared library when we |