From 84514bcbf25a3c06b899c1ac9d70987b92fded22 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 29 Jan 1999 12:01:59 +0000 Subject: [PATCH] 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 . * sysdeps/libm-i387/s_fdim.S: Change fsubp to fsubrp for picky gas. --- ChangeLog | 14 +++++++++-- sysdeps/unix/sparc/fork.S | 4 ++-- sysdeps/unix/sparc/vfork.S | 4 ++-- sysdeps/unix/sysv/linux/sparc/sparc32/fork.S | 12 ++++------ .../unix/sysv/linux/sparc/sparc32/syscalls.list | 2 -- sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 28 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/sparc/sparc64/fork.S | 12 ++++------ .../unix/sysv/linux/sparc/sparc64/syscalls.list | 1 - sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 28 ++++++++++++++++++++++ 9 files changed, 80 insertions(+), 25 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S diff --git a/ChangeLog b/ChangeLog index e2a0923..69b1fef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,17 @@ 1999-01-29 Ulrich Drepper - * sysdeps/libm-i387/s_fdim.S: Change fsubp to fsubrp for picky - gas. + * 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 . + + * sysdeps/libm-i387/s_fdim.S: Change fsubp to fsubrp for picky gas. * sysdeps/libm-i387/s_fdimf.S: Likewise. * sysdeps/libm-i387/s_fdiml.S: Likewise. diff --git a/sysdeps/unix/sparc/fork.S b/sysdeps/unix/sparc/fork.S index b586f25..28564a6 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 02a5ab9..5035cc0 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 951ab49..73334ed 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 , 1997. @@ -20,13 +20,9 @@ #include 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 984540c..6794891 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 0000000..898230c --- /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 , 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 + +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 c735da5..3e78a0b 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 , 1997. @@ -20,13 +20,9 @@ #include 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 811cc87..5e04be3 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 0000000..898230c --- /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 , 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 + +PSEUDO (__vfork, vfork, 0) + sub %o1, 1, %o1 + retl + and %o0, %o1, %o0 + +PSEUDO_END (__vfork) +weak_alias (__vfork, vfork) -- 2.7.4