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/i386/memchr.c  |  3 +--
 libc/string/i386/memcpy.c  |  3 +--
 libc/string/i386/memmove.c |  3 +--
 libc/string/i386/memset.c  |  3 +--
 libc/string/i386/strcat.c  |  3 +--
 libc/string/i386/strchr.c  |  5 ++---
 libc/string/i386/strcmp.c  | 12 +++++-------
 libc/string/i386/strcpy.c  |  3 +--
 libc/string/i386/strlen.c  |  3 +--
 libc/string/i386/strncat.c |  3 +--
 libc/string/i386/strncmp.c |  3 +--
 libc/string/i386/strncpy.c |  3 +--
 libc/string/i386/strnlen.c |  3 +--
 libc/string/i386/strrchr.c |  5 ++---
 14 files changed, 20 insertions(+), 35 deletions(-)

(limited to 'libc/string/i386')

diff --git a/libc/string/i386/memchr.c b/libc/string/i386/memchr.c
index 5994a4b67..c7cd33758 100644
--- a/libc/string/i386/memchr.c
+++ b/libc/string/i386/memchr.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef memchr
 void attribute_hidden *__memchr(const void *cs, int c, size_t count)
 {
     int d0;
@@ -49,4 +48,4 @@ void attribute_hidden *__memchr(const void *cs, int c, size_t count)
     return __res;
 }
 
-strong_alias(__memchr, memchr)
+strong_alias(__memchr,memchr)
diff --git a/libc/string/i386/memcpy.c b/libc/string/i386/memcpy.c
index 1cd234685..12ba8d7de 100644
--- a/libc/string/i386/memcpy.c
+++ b/libc/string/i386/memcpy.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef memcpy
 void attribute_hidden *__memcpy(void * to, const void * from, size_t n)
 {
     int d0, d1, d2;
@@ -51,4 +50,4 @@ void attribute_hidden *__memcpy(void * to, const void * from, size_t n)
     return (to);
 }
 
-strong_alias(__memcpy, memcpy)
+strong_alias(__memcpy,memcpy)
diff --git a/libc/string/i386/memmove.c b/libc/string/i386/memmove.c
index 4bc5f3e42..d6e29e553 100644
--- a/libc/string/i386/memmove.c
+++ b/libc/string/i386/memmove.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef memmove
 void attribute_hidden *__memmove(void *dest, const void *src, size_t n)
 {
     int d0, d1, d2;
@@ -57,4 +56,4 @@ void attribute_hidden *__memmove(void *dest, const void *src, size_t n)
     return dest;
 }
 
-strong_alias(__memmove, memmove)
+strong_alias(__memmove,memmove)
diff --git a/libc/string/i386/memset.c b/libc/string/i386/memset.c
index 0fd9e2019..eadbf9feb 100644
--- a/libc/string/i386/memset.c
+++ b/libc/string/i386/memset.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef memset
 void attribute_hidden *__memset(void *s, int c, size_t count)
 {
     int d0, d1;
@@ -45,4 +44,4 @@ void attribute_hidden *__memset(void *s, int c, size_t count)
     return s;
 }
 
-strong_alias(__memset, memset)
+strong_alias(__memset,memset)
diff --git a/libc/string/i386/strcat.c b/libc/string/i386/strcat.c
index eb3c81ec1..02b2a3c5b 100644
--- a/libc/string/i386/strcat.c
+++ b/libc/string/i386/strcat.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef strcat
 char attribute_hidden *__strcat(char * dest, const char * src)
 {
     int d0, d1, d2, d3;
@@ -49,4 +48,4 @@ char attribute_hidden *__strcat(char * dest, const char * src)
     return dest;
 }
 
-strong_alias(__strcat, strcat)
+strong_alias(__strcat,strcat)
diff --git a/libc/string/i386/strchr.c b/libc/string/i386/strchr.c
index 5fe689d1a..a8343fa00 100644
--- a/libc/string/i386/strchr.c
+++ b/libc/string/i386/strchr.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef strchr
 char attribute_hidden *__strchr(const char *s, int c)
 {
     int d0;
@@ -51,6 +50,6 @@ char attribute_hidden *__strchr(const char *s, int c)
     return __res;
 }
 
-strong_alias(__strchr, strchr)
+strong_alias(__strchr,strchr)
 
-weak_alias(strchr, index)
+strong_alias(__strchr,index)
diff --git a/libc/string/i386/strcmp.c b/libc/string/i386/strcmp.c
index 3786d5983..f335da646 100644
--- a/libc/string/i386/strcmp.c
+++ b/libc/string/i386/strcmp.c
@@ -31,9 +31,7 @@
  */
 
 #include <string.h>
-#include <locale.h> /* for __LOCALE_C_ONLY */
 
-#undef strcmp
 int attribute_hidden __strcmp(const char *cs, const char *ct)
 {
     int d0, d1;
@@ -54,9 +52,9 @@ int attribute_hidden __strcmp(const char *cs, const char *ct)
     return __res;
 }
 
-strong_alias(__strcmp, strcmp)
+strong_alias(__strcmp,strcmp)
 
-#ifdef __LOCALE_C_ONLY
-hidden_strong_alias(__strcmp, __strcoll)
-strong_alias(__strcmp, strcoll)
-#endif /* __LOCALE_C_ONLY */
+#ifndef __UCLIBC_HAS_LOCALE__
+hidden_strong_alias(__strcmp,__strcoll)
+strong_alias(__strcmp,strcoll)
+#endif
diff --git a/libc/string/i386/strcpy.c b/libc/string/i386/strcpy.c
index 1b9bcfded..59effd45e 100644
--- a/libc/string/i386/strcpy.c
+++ b/libc/string/i386/strcpy.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef strcpy
 char attribute_hidden *__strcpy(char * dest, const char * src)
 {
     int d0, d1, d2;
@@ -46,4 +45,4 @@ char attribute_hidden *__strcpy(char * dest, const char * src)
     return dest;
 }
 
-strong_alias(__strcpy, strcpy)
+strong_alias(__strcpy,strcpy)
diff --git a/libc/string/i386/strlen.c b/libc/string/i386/strlen.c
index 859d0928c..01cc46f9e 100644
--- a/libc/string/i386/strlen.c
+++ b/libc/string/i386/strlen.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef strlen
 size_t attribute_hidden __strlen(const char *s)
 {
     int d0;
@@ -46,4 +45,4 @@ size_t attribute_hidden __strlen(const char *s)
     return __res;
 }
 
-strong_alias(__strlen, strlen)
+strong_alias(__strlen,strlen)
diff --git a/libc/string/i386/strncat.c b/libc/string/i386/strncat.c
index b57568166..b55b87b59 100644
--- a/libc/string/i386/strncat.c
+++ b/libc/string/i386/strncat.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef strncat
 char attribute_hidden *__strncat(char * dest, 
 	const char * src, size_t count)
 {
@@ -59,4 +58,4 @@ char attribute_hidden *__strncat(char * dest,
     return dest;
 }
 
-strong_alias(__strncat, strncat)
+strong_alias(__strncat,strncat)
diff --git a/libc/string/i386/strncmp.c b/libc/string/i386/strncmp.c
index 825980d4d..2e22bf642 100644
--- a/libc/string/i386/strncmp.c
+++ b/libc/string/i386/strncmp.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef strncmp
 int attribute_hidden __strncmp(const char *cs, const char *ct, size_t count)
 {
     register int __res;
@@ -56,4 +55,4 @@ int attribute_hidden __strncmp(const char *cs, const char *ct, size_t count)
     return __res;
 }
 
-strong_alias(__strncmp, strncmp)
+strong_alias(__strncmp,strncmp)
diff --git a/libc/string/i386/strncpy.c b/libc/string/i386/strncpy.c
index db135ee4a..272c60ee4 100644
--- a/libc/string/i386/strncpy.c
+++ b/libc/string/i386/strncpy.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef strncpy
 char attribute_hidden *__strncpy(char * dest, const char * src, size_t count)
 {
     int d0, d1, d2, d3;
@@ -54,4 +53,4 @@ char attribute_hidden *__strncpy(char * dest, const char * src, size_t count)
     return dest;
 }
 
-strong_alias(__strncpy, strncpy)
+strong_alias(__strncpy,strncpy)
diff --git a/libc/string/i386/strnlen.c b/libc/string/i386/strnlen.c
index 4fceedf51..ef5c83a9a 100644
--- a/libc/string/i386/strnlen.c
+++ b/libc/string/i386/strnlen.c
@@ -33,7 +33,6 @@
 #define _GNU_SOURCE
 #include <string.h>
 
-#undef strnlen
 size_t attribute_hidden __strnlen(const char *s, size_t count)
 {
     int d0;
@@ -53,4 +52,4 @@ size_t attribute_hidden __strnlen(const char *s, size_t count)
     return __res;
 }
 
-strong_alias(__strnlen, strnlen)
+strong_alias(__strnlen,strnlen)
diff --git a/libc/string/i386/strrchr.c b/libc/string/i386/strrchr.c
index 8468ee511..9f0f65a36 100644
--- a/libc/string/i386/strrchr.c
+++ b/libc/string/i386/strrchr.c
@@ -32,7 +32,6 @@
 
 #include <string.h>
 
-#undef strrchr
 char attribute_hidden *__strrchr(const char *s, int c)
 {
     int d0, d1;
@@ -49,6 +48,6 @@ char attribute_hidden *__strrchr(const char *s, int c)
     return __res;
 }
 
-strong_alias(__strrchr, strrchr)
+strong_alias(__strrchr,strrchr)
 
-weak_alias(strrchr, rindex)
+strong_alias(__strrchr,rindex)
-- 
cgit v1.2.3