From 39507e4a6c52d67780d194dae8cfb636e2dbb87e Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 26 Jun 2014 09:30:52 -0700 Subject: S390: Consolidate NPTL/non versions of vfork --- .../unix/sysv/linux/s390/s390-32/pt-vfork.S | 52 -------------------- nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S | 55 --------------------- .../unix/sysv/linux/s390/s390-64/pt-vfork.S | 55 --------------------- nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S | 57 ---------------------- 4 files changed, 219 deletions(-) delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S delete mode 100644 nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S (limited to 'nptl') diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S deleted file mode 100644 index 4908562..0000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright (C) 2003-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Martin Schwidefsky , 2003. - - 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 - . */ - -#include -#define _ERRNO_H 1 -#include -#include -#include - -/* Clone the calling process, but without copying the whole address space. - The calling process is suspended until the new process exits or is - replaced by a call to `execve'. Return -1 for errors, 0 to the new process, - and the process ID of the new process to the old process. */ - -ENTRY (__vfork) - ear %r4,%a0 - l %r3,PID(%r4) - lcr %r1,%r3 - st %r1,PID(%r4) - - /* Do vfork system call. */ - svc SYS_ify (vfork) - - ltr %r2,%r2 - je 1f - st %r3,PID(%r4) -1: - /* Check for error. */ - lhi %r4,-4095 - clr %r2,%r4 - jnl SYSCALL_ERROR_LABEL - - /* Normal return. */ - br %r14 -PSEUDO_END(__vfork) - -weak_alias (__vfork, vfork) diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S deleted file mode 100644 index 45411ba..0000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 2004-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2004. - - 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 - . */ - -#include -#define _ERRNO_H 1 -#include -#include -#include - -/* Clone the calling process, but without copying the whole address space. - The calling process is suspended until the new process exits or is - replaced by a call to `execve'. Return -1 for errors, 0 to the new process, - and the process ID of the new process to the old process. */ - -ENTRY (__vfork) - ear %r4,%a0 - lhi %r1,1 - icm %r3,15,PID(%r4) - sll %r1,31 - je 1f - lcr %r1,%r3 -1: st %r1,PID(%r4) - - /* Do vfork system call. */ - svc SYS_ify (vfork) - - ltr %r2,%r2 - je 1f - st %r3,PID(%r4) -1: - /* Check for error. */ - lhi %r4,-4095 - clr %r2,%r4 - jnl SYSCALL_ERROR_LABEL - - /* Normal return. */ - br %r14 -PSEUDO_END(__vfork) -libc_hidden_def (__vfork) -weak_alias (__vfork, vfork) diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S deleted file mode 100644 index 589209d..0000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright (C) 2003-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Martin Schwidefsky , 2003. - - 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 - . */ - -#include -#define _ERRNO_H 1 -#include -#include -#include - -/* Clone the calling process, but without copying the whole address space. - The calling process is suspended until the new process exits or is - replaced by a call to `execve'. Return -1 for errors, 0 to the new process, - and the process ID of the new process to the old process. */ - -ENTRY (__vfork) - - ear %r4,%a0 - sllg %r4,%r4,32 - ear %r4,%a1 - l %r3,PID(%r4) - lcr %r1,%r3 - st %r1,PID(%r4) - - /* Do vfork system call. */ - svc SYS_ify (vfork) - - ltgr %r2,%r2 - je 1f - st %r3,PID(%r4) -1: - /* Check for error. */ - lghi %r4,-4095 - clgr %r2,%r4 - jgnl SYSCALL_ERROR_LABEL - - /* Normal return. */ - br %r14 -PSEUDO_END(__vfork) - -weak_alias (__vfork, vfork) diff --git a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S b/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S deleted file mode 100644 index 205e893..0000000 --- a/nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (C) 2004-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2004. - - 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 - . */ - -#include -#define _ERRNO_H 1 -#include -#include -#include - -/* Clone the calling process, but without copying the whole address space. - The calling process is suspended until the new process exits or is - replaced by a call to `execve'. Return -1 for errors, 0 to the new process, - and the process ID of the new process to the old process. */ - -ENTRY (__vfork) - - ear %r4,%a0 - sllg %r4,%r4,32 - ear %r4,%a1 - icm %r3,15,PID(%r4) - llilh %r1,32768 - je 1f - lcr %r1,%r3 -1: st %r1,PID(%r4) - - /* Do vfork system call. */ - svc SYS_ify (vfork) - - ltgr %r2,%r2 - je 1f - st %r3,PID(%r4) -1: - /* Check for error. */ - lghi %r4,-4095 - clgr %r2,%r4 - jgnl SYSCALL_ERROR_LABEL - - /* Normal return. */ - br %r14 -PSEUDO_END(__vfork) -libc_hidden_def (__vfork) -weak_alias (__vfork, vfork) -- cgit v1.1