From 5eb1fae2a97ffc88d136502ace050662e57ef34a Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Tue, 28 Feb 2006 00:54:02 +0000
Subject: Merge from trunk.

---
 libc/sysdeps/linux/nios2/vfork.S | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'libc/sysdeps/linux/nios2/vfork.S')

diff --git a/libc/sysdeps/linux/nios2/vfork.S b/libc/sysdeps/linux/nios2/vfork.S
index a19a90023..ca8811a4f 100644
--- a/libc/sysdeps/linux/nios2/vfork.S
+++ b/libc/sysdeps/linux/nios2/vfork.S
@@ -9,23 +9,23 @@
  * 
  * Written by Wentao Xu <wentao@microtronix.com>
  */
-#include <asm/unistd.h>
+
+#include <features.h>
+
+#define _ERRNO_H
+#include <bits/errno.h>
+#include <sys/syscall.h>
 
 #ifndef __NR_vfork
 #define __NR_vfork __NR_fork /* uClinux-2.0 only has fork which is vfork */
 #endif
 
-   .text
-   .balign 4
-   .globl errno
-   .globl vfork
-   .globl __libc_vfork
-#if defined __HAVE_ELF__
-   .type    vfork,@function
-   .type    __libc_vfork,@function
-#endif
-vfork:
-__libc_vfork:
+.text
+.global	__vfork
+.hidden	__vfork
+.type	__vfork,%function
+.align 4
+__vfork:
     movui   r2, TRAP_ID_SYSCALL
     movui   r3, __NR_vfork
     trap
@@ -51,3 +51,6 @@ fix_errno:
     addi  sp, sp, 8
     ret
 
+.size __vfork,.-__vfork
+weak_alias(__vfork,vfork)
+libc_hidden_weak(vfork)
-- 
cgit v1.2.3