From fe68563b9a070fedf117c8738652587945427bb3 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Tue, 3 Jan 2006 14:46:56 +0000
Subject: Use strong_alias everywhere instead of .global/.set. Correct some
 cases where the non-hidden version was used.

---
 libc/string/mips/memcpy.S | 8 +++++---
 libc/string/mips/memset.S | 8 +++++---
 libc/string/mips/sysdep.h | 7 +------
 3 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'libc/string/mips')

diff --git a/libc/string/mips/memcpy.S b/libc/string/mips/memcpy.S
index 369c82f39..2e42b1793 100644
--- a/libc/string/mips/memcpy.S
+++ b/libc/string/mips/memcpy.S
@@ -17,6 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
 /*#include <sysdep.h>*/
 #include <endian.h>
 #include "sysdep.h"
@@ -39,7 +40,7 @@
 #  define SWLO	swl		/* low part is left in little-endian	*/
 #endif
 
-ENTRY (memcpy)
+ENTRY (__memcpy)
 	.set	noreorder
 
 	slti	t0, a2, 8		# Less than 8?
@@ -136,5 +137,6 @@ L(shfth):
 	move	a2, t0
 
 	.set	reorder
-END (memcpy)
-libc_hidden_builtin_def (memcpy)
+END (__memcpy)
+
+strong_alias(__memcpy,memcpy)
diff --git a/libc/string/mips/memset.S b/libc/string/mips/memset.S
index 0919fb82e..4269ebc6e 100644
--- a/libc/string/mips/memset.S
+++ b/libc/string/mips/memset.S
@@ -17,6 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#include <features.h>
 /*#include <sysdep.h>*/
 #include <endian.h>
 #include "sysdep.h"
@@ -33,7 +34,7 @@
 # define SWHI	swr		/* high part is right in little-endian	*/
 #endif
 
-ENTRY (memset)
+ENTRY (__memset)
 	.set	noreorder
 
 	slti	t1, a2, 8		# Less than 8?
@@ -86,5 +87,6 @@ L(exit):
 	nop
 
 	.set	reorder
-END (memset)
-libc_hidden_builtin_def (memset)
+END (__memset)
+
+strong_alias(__memset,memset)
diff --git a/libc/string/mips/sysdep.h b/libc/string/mips/sysdep.h
index 89674fef7..27518ac42 100644
--- a/libc/string/mips/sysdep.h
+++ b/libc/string/mips/sysdep.h
@@ -27,6 +27,7 @@
 
 #define ENTRY(name) \
   .globl name;                                                                \
+  .hidden name;                                                               \
   .align 2;                                                                   \
   .ent name,0;                                                                \
   name##:
@@ -42,10 +43,4 @@
 # define L(label) .L ## label
 #endif
 
-#ifdef libc_hidden_builtin_def
-#error "WHOA!!! libc_hidden_builtin_def is defined"
-#else
-#define libc_hidden_builtin_def(name) .global __ ## name ; __ ## name = name
-#endif
-
 #endif
-- 
cgit v1.2.3