diff options
author | Roland McGrath <roland@hack.frob.com> | 2014-05-14 09:44:39 -0700 |
---|---|---|
committer | Roland McGrath <roland@hack.frob.com> | 2014-05-14 09:44:39 -0700 |
commit | e27871374eda477318f5a694d26cc02fd1cf019e (patch) | |
tree | 9f3a2a0d27cc8700a4ee0d92940ab572ed3f39ef /nptl/sysdeps/unix/sysv | |
parent | 5675da1e845e4b651eb649639137310fd9b6b380 (diff) | |
download | glibc-e27871374eda477318f5a694d26cc02fd1cf019e.zip glibc-e27871374eda477318f5a694d26cc02fd1cf019e.tar.gz glibc-e27871374eda477318f5a694d26cc02fd1cf019e.tar.bz2 |
x86: Consolidate NPTL/non versions of vfork
Diffstat (limited to 'nptl/sysdeps/unix/sysv')
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S | 66 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/vfork.S | 44 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S | 32 | ||||
-rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S | 42 |
4 files changed, 0 insertions, 184 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S deleted file mode 100644 index 0a3d63e..0000000 --- a/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright (C) 1999-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Schwab <schwab@gnu.org>. - - 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 <sysdep.h> -#define _ERRNO_H 1 -#include <bits/errno.h> -#include <kernel-features.h> -#include <tcb-offsets.h> - -/* Save the PID value. */ -#define SAVE_PID \ - movl %gs:PID, %edx; \ - movl %edx, %eax; \ - negl %eax; \ - movl %eax, %gs:PID - -/* Restore the old PID value in the parent. */ -#define RESTORE_PID \ - testl %eax, %eax; \ - je 1f; \ - movl %edx, %gs:PID; \ -1: - -/* 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) - /* Pop the return PC value into ECX. */ - popl %ecx - - SAVE_PID - - /* Stuff the syscall number in EAX and enter into the kernel. */ - movl $SYS_ify (vfork), %eax - int $0x80 - - RESTORE_PID - - /* Jump to the return PC. Don't jump directly since this - disturbs the branch target cache. Instead push the return - address back on the stack. */ - pushl %ecx - - cmpl $-4095, %eax - jae SYSCALL_ERROR_LABEL /* Branch forward if it failed. */ - ret -PSEUDO_END (__vfork) - -weak_alias (__vfork, vfork) diff --git a/nptl/sysdeps/unix/sysv/linux/i386/vfork.S b/nptl/sysdeps/unix/sysv/linux/i386/vfork.S deleted file mode 100644 index 5e0e5e0..0000000 --- a/nptl/sysdeps/unix/sysv/linux/i386/vfork.S +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (C) 1999-2014 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/>. */ - -/* We want an #include_next, but we are the main source file. - So, #include ourselves and in that incarnation we can use #include_next. */ -#ifndef INCLUDED_SELF -# define INCLUDED_SELF -# include <vfork.S> -#else - -# include <tcb-offsets.h> - -/* Save the PID value. */ -# define SAVE_PID \ - movl %gs:PID, %edx; \ - movl %edx, %eax; \ - negl %eax; \ - jne 1f; \ - movl $0x80000000, %eax; \ -1: movl %eax, %gs:PID - -/* Restore the old PID value in the parent. */ -# define RESTORE_PID \ - testl %eax, %eax; \ - je 1f; \ - movl %edx, %gs:PID; \ -1: - -# include_next <vfork.S> -#endif diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S deleted file mode 100644 index 77144ef..0000000 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pt-vfork.S +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 2004-2014 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 <tcb-offsets.h> - -#define SAVE_PID \ - movl %fs:PID, %esi; \ - movl %esi, %edx; \ - negl %edx; \ - movl %edx, %fs:PID - -#define RESTORE_PID \ - testq %rax, %rax; \ - je 1f; \ - movl %esi, %fs:PID; \ -1: - -#include <../../../../../../sysdeps/unix/sysv/linux/x86_64/vfork.S> diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S b/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S deleted file mode 100644 index c6058af..0000000 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 2004-2014 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/>. */ - -/* We want an #include_next, but we are the main source file. - So, #include ourselves and in that incarnation we can use #include_next. */ -#ifndef INCLUDED_SELF -# define INCLUDED_SELF -# include <vfork.S> -#else - -# include <tcb-offsets.h> - -# define SAVE_PID \ - movl %fs:PID, %esi; \ - movl $0x80000000, %ecx; \ - movl %esi, %edx; \ - negl %edx; \ - cmove %ecx, %edx; \ - movl %edx, %fs:PID - -# define RESTORE_PID \ - testq %rax, %rax; \ - je 1f; \ - movl %esi, %fs:PID; \ -1: - -# include_next <vfork.S> -#endif |