svn commit: trunk/uClibc/libc/sysdeps/linux: i386 powerpc sparc x86_64

psm at uclibc.org psm at uclibc.org
Wed Jan 25 19:41:24 UTC 2006


Author: psm
Date: 2006-01-25 11:41:22 -0800 (Wed, 25 Jan 2006)
New Revision: 13608

Log:
Use #define __NR_vfork __NR_fork consistently

Modified:
   trunk/uClibc/libc/sysdeps/linux/i386/vfork.S
   trunk/uClibc/libc/sysdeps/linux/powerpc/vfork.S
   trunk/uClibc/libc/sysdeps/linux/sparc/vfork.S
   trunk/uClibc/libc/sysdeps/linux/x86_64/vfork.S


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/i386/vfork.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/i386/vfork.S	2006-01-25 17:53:04 UTC (rev 13607)
+++ trunk/uClibc/libc/sysdeps/linux/i386/vfork.S	2006-01-25 19:41:22 UTC (rev 13608)
@@ -4,13 +4,13 @@
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
 
-#include <features.h>
 #include <sys/syscall.h>
 
 #ifndef __NR_vfork
 /* No vfork so use fork instead */
-hidden_strong_alias(__libc_fork,__vfork)
-#else
+# define __NR_vfork __NR_fork
+#endif
+
 .text
 .global __vfork
 .hidden __vfork
@@ -27,6 +27,6 @@
 	ret
 
 .size __vfork,.-__vfork
-#endif
+
 weak_alias(__vfork,vfork)
 libc_hidden_def(vfork)

Modified: trunk/uClibc/libc/sysdeps/linux/powerpc/vfork.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/powerpc/vfork.S	2006-01-25 17:53:04 UTC (rev 13607)
+++ trunk/uClibc/libc/sysdeps/linux/powerpc/vfork.S	2006-01-25 19:41:22 UTC (rev 13608)
@@ -3,17 +3,14 @@
  *
  * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
  */
-#include <features.h>
+
 #include <sys/syscall.h>
 
 #ifndef __NR_vfork
-
 /* No vfork so use fork instead */
-strong_alias(fork,__libc_fork)
-hidden_strong_alias(__libc_fork,__vfork)
+# define __NR_vfork __NR_fork
+#endif
 
-#else
-
 .text
 .global __vfork
 .hidden __vfork
@@ -27,6 +24,6 @@
 	b	__syscall_error
 
 .size __vfork,.-__vfork
-#endif
+
 weak_alias(__vfork,vfork)
 libc_hidden_def(vfork)

Modified: trunk/uClibc/libc/sysdeps/linux/sparc/vfork.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/sparc/vfork.S	2006-01-25 17:53:04 UTC (rev 13607)
+++ trunk/uClibc/libc/sysdeps/linux/sparc/vfork.S	2006-01-25 19:41:22 UTC (rev 13608)
@@ -19,17 +19,13 @@
 
 /* Code taken from glibc2.2.2/sysdeps/unix/sysv/linux/sparc/vfork.S */
 
-#include <features.h>
 #include <sys/syscall.h>
 
 #ifndef __NR_vfork
 /* No vfork so use fork instead */
+# define __NR_vfork __NR_fork
+#endif
 
-strong_alias(fork,__libc_fork)
-hidden_strong_alias(__libc_fork,__vfork)
-
-#else
-
 .text
 .global	__vfork
 .hidden	__vfork
@@ -54,6 +50,6 @@
 	and	%o0, %o1, %o0
 
 .size __vfork,.-__vfork
-#endif /* __NR_vfork */
+
 weak_alias(__vfork,vfork)
 libc_hidden_def(vfork)

Modified: trunk/uClibc/libc/sysdeps/linux/x86_64/vfork.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/x86_64/vfork.S	2006-01-25 17:53:04 UTC (rev 13607)
+++ trunk/uClibc/libc/sysdeps/linux/x86_64/vfork.S	2006-01-25 19:41:22 UTC (rev 13608)
@@ -16,7 +16,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include <features.h>
 #include <sys/syscall.h>
 
 /* Clone the calling process, but without copying the whole address space.
@@ -26,11 +25,9 @@
 
 #ifndef __NR_vfork
 /* No vfork so use fork instead */
-strong_alias(fork,__libc_fork)
-hidden_strong_alias(__libc_fork,__vfork)
+# define __NR_vfork __NR_fork
+#endif
 
-#else
-
 .text
 .global __vfork
 .hidden __vfork
@@ -58,6 +55,5 @@
 
 .size __vfork,.-__vfork
 
-#endif /* __NR_vfork */
 weak_alias(__vfork,vfork)
 libc_hidden_def(vfork)




More information about the uClibc-cvs mailing list