4 files changed, 71 insertions, 27 deletions
diff --git a/sysdeps/unix/sysv/linux/ia64/fork.c b/sysdeps/unix/sysv/linux/ia64/fork.S
index c63e994622..404f3535fc 100644
--- a/sysdeps/unix/sysv/linux/ia64/fork.c
+++ b/sysdeps/unix/sysv/linux/ia64/fork.S
@@ -1,7 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Written by Andreas Schwab, <schwab@issan.informatik.uni-dortmund.de>,
-   December 1995.
+/* Copyright (C) 2000 Free Software Foundation, Inc.
 
    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
@@ -18,17 +15,26 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <unistd.h>
-#include <asm/signal.h>
 
-extern int __clone (int (*fn)(void *), void *ksp, unsigned long int flags,
-		  void *arg);
+#include <sysdep.h>
+#define _SIGNAL_H
+#include <bits/signum.h>
 
-int
-__libc_fork (void)
-{
-  return __clone (NULL, NULL, SIGCHLD, 0);
-}
+/* pid_t fork(void); */
+/* Implemented as a clone system call with parameters SIGCHLD and 0	*/
+
+ENTRY(__libc_fork)
+	alloc r2=ar.pfs,0,0,2,0
+	mov out0=SIGCHLD	/* Return SIGCHLD when child finishes	*/
+				/* no other clone flags; nothing shared	*/
+	mov out1=0		/* Standard sp value.			*/
+	;;
+	DO_CALL (SYS_ify (clone))
+	cmp.eq p6,p0=-1,r10
+	;;
+(p6)	br.cond.spnt.few __syscall_error
+	ret
+PSEUDO_END(__libc_fork)
 
-weak_alias (__libc_fork, fork)
 weak_alias (__libc_fork, __fork)
+weak_alias (__libc_fork, fork)
diff --git a/sysdeps/unix/sysv/linux/ia64/vfork.S b/sysdeps/unix/sysv/linux/ia64/vfork.S
new file mode 100644
index 0000000000..e873c784ba
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ia64/vfork.S
@@ -0,0 +1,43 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+
+   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 _SIGNAL_H
+#include <bits/signum.h>
+
+/* The following are defined in linux/sched.h, which unfortunately	*/
+/* is not safe for inclusion in an assembly file.			*/
+#define CLONE_VM        0x00000100      /* set if VM shared between processes */
+#define CLONE_VFORK     0x00004000      /* set if the parent wants the child to wake it up on mm_release */
+
+/* pid_t vfork(void); */
+/* Implemented as __clone_syscall(CLONE_VFORK | CLONE_VM | SIGCHLD, 0)	*/
+
+ENTRY(__vfork)
+	alloc r2=ar.pfs,0,0,2,0
+	mov out0=CLONE_VM+CLONE_VFORK+SIGCHLD
+	mov out1=0		/* Standard sp value.			*/
+	;;
+	DO_CALL (SYS_ify (clone))
+	cmp.eq p6,p0=-1,r10
+	;;
+(p6)	br.cond.spnt.few __syscall_error
+	ret
+PSEUDO_END(__vfork)
+
+weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
index e40ee32706..9dd9155acc 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
    Contributed by Richard Henderson (rth@tamu.edu).
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -35,30 +35,26 @@ __clone:
 	/* sanity check arguments */
 	tst	%i0
 	be	.Lerror
-	 tst	%i1
+	 orcc	%i1,%g0,%o1
 	be	.Lerror
-	 nop
+	 mov	%i2,%o0
 
 	/* Do the system call */
-	mov	%i1,%o1
-	mov	%i2,%o0
 	set	__NR_clone,%g1
 	ta	0x10
 	bcs	.Lerror
 	 tst	%o1
 	bne	__thread_start
 	 nop
-	mov	%o0,%i0
 	ret
-	 restore
+	 restore %o0,%g0,%o0
 
 .Lerror:
 	call	__errno_location
 	 or	%g0,EINVAL,%i0
 	st	%i0,[%o0]
-	mov	-1,%i0
 	ret
-	 restore
+	 restore %g0,-1,%o0
 
 	.size	__clone, .-__clone
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
index d7506b7c72..a8e317e509 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2000 Free Software Foundation, Inc.
    Contributed by Richard Henderson (rth@tamu.edu).
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -45,7 +45,7 @@ __clone:
 	ta	0x6d
 	bcs,pn	%xcc, 99f
 	 nop
-	brnz,pn	%o0, __thread_start
+	brnz,pn	%o1, __thread_start
 	 mov	%o0, %i0
 	ret
 	 restore
@@ -70,9 +70,8 @@ __clone:
 	 nop
 	st	%i0, [%o0]
 #endif
-	mov	-1,%i0
 	ret
-	 restore
+	 restore %g0,-1,%o0
 	.size __clone, .-__clone
 
 	.type __thread_start,@function