diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/vfork.S | 66 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/vfork.c | 50 |
3 files changed, 71 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog index b3a2938d4f..c2d47fa33b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-01-15 Ulrich Drepper <drepper@cygnus.com> + + * sysdeps/unix/sysv/linux/vfork.c: Removed. + * sysdeps/unix/sysv/linux/i386/vfork.S: New file. + 1999-01-14 Ulrich Drepper <drepper@cygnus.com> * Make-dist: If file is generated but still distributed the later diff --git a/sysdeps/unix/sysv/linux/i386/vfork.S b/sysdeps/unix/sysv/linux/i386/vfork.S new file mode 100644 index 0000000000..118fccb613 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/vfork.S @@ -0,0 +1,66 @@ +/* Copyright (C) 1999 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 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> +#define _ERRNO_H 1 +#include <bits/errno.h> + +/* 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) + +#ifdef __NR_vfork + + /* Pop the return PC value into ECX. */ + popl %ecx + + /* Stuff the syscall number in EAX and enter into the kernel. */ + movl $SYS_ify (vfork), %eax + int $0x80 + cmpl $-4095, %eax + jae .Lerror /* Branch forward if it failed. */ + + /* Jump to the return PC. */ + jmp *%ecx + +.Lerror: + /* Push back the return PC. */ + pushl %ecx + + /* Check if vfork syscall is known at all. */ + cmpl $-ENOSYS, %eax + jne SYSCALL_ERROR_LABEL + +#endif + + /* If we don't have vfork, fork is close enough. */ + + movl $SYS_ify (fork), %eax + int $0x80 + cmpl $-4095, %eax + jae SYSCALL_ERROR_LABEL +.Lpseudo_end: + ret + +PSEUDO_END (__vfork) + +weak_alias (__vfork, vfork) diff --git a/sysdeps/unix/sysv/linux/vfork.c b/sysdeps/unix/sysv/linux/vfork.c deleted file mode 100644 index de250e8ebb..0000000000 --- a/sysdeps/unix/sysv/linux/vfork.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright (C) 1992, 1995, 1997, 1999 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 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 <errno.h> -#include <unistd.h> - -#include <sysdep.h> -#include <sys/syscall.h> - -extern pid_t __syscall_fork __P ((void)); - -#ifdef __NR_vfork -extern pid_t __syscall_vfork __P ((void)); - -/* Use the system call. If it's not available, fork is close enough. */ - -pid_t -__vfork __P ((void)) -{ - pid_t retval = INLINE_SYSCALL (vfork, 0); - - if (retval == (pid_t) -1 && errno == ENOSYS) - retval = INLINE_SYSCALL (fork, 0); - - return retval; -} -#else -pid_t -__vfork __P ((void)) -{ - return INLINE_SYSCALL (fork, 0); -} -#endif - -weak_alias (__vfork, vfork) |