Update.

	* sysdeps/unix/sparc/vfork.S: Correct comment.
	* sysdeps/unix/sparc/fork.S: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: Remove vfork.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/fork.S: No special case for
	child necessary.
	* sysdeps/unix/sysv/linux/sparc/sparc64/fork.S: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: New file.
	Patches by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>.

	* sysdeps/libm-i387/s_fdim.S: Change fsubp to fsubrp for picky gas.

8 files changed, 68 insertions, 23 deletions

diff --git a/sysdeps/unix/sparc/fork.S b/sysdeps/unix/sparc/fork.S
index b586f257ab..28564a6378 100644
--- a/sysdeps/unix/sparc/fork.S
+++ b/sysdeps/unix/sparc/fork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 94, 95, 97, 99 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
@@ -22,7 +22,7 @@ SYSCALL__ (fork, 0)
 	/* %o1 is now 0 for the parent and 1 for the child.  Decrement it to
 	   make it -1 (all bits set) for the parent, and 0 (no bits set)
 	   for the child.  Then AND it with %o0, so the parent gets
-	   %o0&-1==0, and the child gets %o0&0==0.  */
+	   %o0&-1==pid, and the child gets %o0&0==0.  */
 	sub %o1, 1, %o1
 	retl
 	and %o0, %o1, %o0
diff --git a/sysdeps/unix/sparc/vfork.S b/sysdeps/unix/sparc/vfork.S
index 02a5ab9aa3..5035cc0dab 100644
--- a/sysdeps/unix/sparc/vfork.S
+++ b/sysdeps/unix/sparc/vfork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1994, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 94, 95, 97, 99 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
@@ -26,7 +26,7 @@ SYSCALL__ (vfork, 0)
 	/* %o1 is now 0 for the parent and 1 for the child.  Decrement it to
 	   make it -1 (all bits set) for the parent, and 0 (no bits set)
 	   for the child.  Then AND it with %o0, so the parent gets
-	   %o0&-1==0, and the child gets %o0&0==0.  */
+	   %o0&-1==pid, and the child gets %o0&0==0.  */
 	sub %o1, 1, %o1
 	retl
 	and %o0, %o1, %o0
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/fork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/fork.S
index 951ab4981b..73334ed528 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/fork.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/fork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, 1997.
 
@@ -20,13 +20,9 @@
 #include <sysdep.h>
 
 PSEUDO (__libc_fork, fork, 0)
-	tst %o1
-	be,a parent
-	nop
-	/* child: return 0 */
-	clr %o0
-parent:
-	ret
+	sub %o1, 1, %o1
+	retl
+	 and %o0, %o1, %o0
 
 PSEUDO_END (__libc_fork)
 weak_alias (__libc_fork, __fork)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
index 984540c31a..6794891ec8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
@@ -1,7 +1,5 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
-vfork		-	vfork		0	__vfork		vfork
-
 s_getgroups	getgroups getgroups	2	__syscall_getgroups
 s_getpagesize	getpagesize getpagesize	0	__syscall_getpagesize
 s_llseek	llseek	_llseek		5	__syscall__llseek
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
new file mode 100644
index 0000000000..898230cb42
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
@@ -0,0 +1,28 @@
+/* Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
+
+   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>
+
+PSEUDO (__vfork, vfork, 0)
+	sub	%o1, 1, %o1
+	retl
+	 and	%o0, %o1, %o0
+
+PSEUDO_END (__vfork)
+weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/fork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/fork.S
index c735da5a44..3e78a0b0d4 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/fork.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/fork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, 1997.
 
@@ -20,13 +20,9 @@
 #include <sysdep.h>
 
 PSEUDO (__libc_fork, fork, 0)
-	tst	%o1
-	be	%xcc, 1f
-	 nop
-	/* child: return 0 */
-	clr	%o0
-1:	ret
-
+	sub	%o1, 1, %o1
+	retl
+	 and	%o0, %o1, %o0
 PSEUDO_END (__libc_fork)
 
 weak_alias (__libc_fork, __fork)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
index 811cc87ab1..5e04be3f54 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
@@ -11,7 +11,6 @@ setrlimit	-	setrlimit	2	setrlimit	setrlimit64
 ftruncate	-	ftruncate	2	__ftruncate	ftruncate ftruncate64
 truncate	-	truncate	2	truncate	truncate64
 mmap		-	mmap		6	__mmap		mmap __mmap64 mmap64
-vfork		-	vfork		0	__vfork		vfork
 
 # Override select.S in parent directory:
 select		-	select		5	__select	select
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
new file mode 100644
index 0000000000..898230cb42
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
@@ -0,0 +1,28 @@
+/* Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
+
+   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>
+
+PSEUDO (__vfork, vfork, 0)
+	sub	%o1, 1, %o1
+	retl
+	 and	%o0, %o1, %o0
+
+PSEUDO_END (__vfork)
+weak_alias (__vfork, vfork)