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/m68k/vfork.S | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/libc/sysdeps/linux/m68k/vfork.S b/libc/sysdeps/linux/m68k/vfork.S
index e58b9e949..56d57f73c 100644
--- a/libc/sysdeps/linux/m68k/vfork.S
+++ b/libc/sysdeps/linux/m68k/vfork.S
@@ -1,3 +1,9 @@
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
 #include <features.h>
 
 #include <asm/unistd.h>
@@ -12,10 +18,8 @@
 	.align 2
 	.globl errno
 	.globl	__vfork
-#ifdef __HAVE_ELF__
 	.hidden	__vfork
 	.type	__vfork,@function
-#endif
 
 __vfork:
 	movl	%sp@+, %a1               /* save the return address for later */
@@ -37,4 +41,5 @@ fix_errno:
 	jmp		%a1@                     /* don't return,  just jmp directly */
 
 .size __vfork,.-__vfork
-strong_alias(__vfork,vfork)
+weak_alias(__vfork,vfork)
+libc_hidden_weak(vfork)
-- 
cgit v1.2.3