From e11c3011b10ada67c68d2d43a56fe606d35ca507 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 22 Dec 2007 06:28:23 +0000
Subject: mark a bunch of public mem/str functions as weak so that people who
 insist on their own local copies while static linking dont hit link failures
 when other uClibc code force the libc.a objects to be pulled in via the
 hidden alias symbols

---
 libc/string/generic/memchr.c  | 2 +-
 libc/string/generic/memcmp.c  | 2 +-
 libc/string/generic/memcpy.c  | 2 +-
 libc/string/generic/memmove.c | 2 +-
 libc/string/generic/mempcpy.c | 2 +-
 libc/string/generic/memset.c  | 2 +-
 libc/string/generic/strchr.c  | 4 ++--
 libc/string/generic/strcmp.c  | 2 +-
 libc/string/generic/strlen.c  | 2 +-
 libc/string/generic/strrchr.c | 4 ++--
 10 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'libc/string/generic')

diff --git a/libc/string/generic/memchr.c b/libc/string/generic/memchr.c
index 4bda5d758..4b40e4d65 100644
--- a/libc/string/generic/memchr.c
+++ b/libc/string/generic/memchr.c
@@ -174,4 +174,4 @@ void *memchr (const void * s, int c_in, size_t n)
 
   return 0;
 }
-libc_hidden_def(memchr)
+libc_hidden_weak(memchr)
diff --git a/libc/string/generic/memcmp.c b/libc/string/generic/memcmp.c
index b754a5195..b0d05cf8a 100644
--- a/libc/string/generic/memcmp.c
+++ b/libc/string/generic/memcmp.c
@@ -330,7 +330,7 @@ memcmp (const __ptr_t s1, const __ptr_t s2, size_t len)
 
   return 0;
 }
-libc_hidden_def(memcmp)
+libc_hidden_weak(memcmp)
 #ifdef __UCLIBC_SUSV3_LEGACY__
 strong_alias(memcmp,bcmp)
 #endif
diff --git a/libc/string/generic/memcpy.c b/libc/string/generic/memcpy.c
index 42e97a063..9d8764105 100644
--- a/libc/string/generic/memcpy.c
+++ b/libc/string/generic/memcpy.c
@@ -244,4 +244,4 @@ void *memcpy (void *dstpp, const void *srcpp, size_t len)
 
   return dstpp;
 }
-libc_hidden_def(memcpy)
+libc_hidden_weak(memcpy)
diff --git a/libc/string/generic/memmove.c b/libc/string/generic/memmove.c
index 68caacd78..dca74ae74 100644
--- a/libc/string/generic/memmove.c
+++ b/libc/string/generic/memmove.c
@@ -279,4 +279,4 @@ void *memmove (void *dest, const void *src, size_t len)
 
   return (dest);
 }
-libc_hidden_def(memmove)
+libc_hidden_weak(memmove)
diff --git a/libc/string/generic/mempcpy.c b/libc/string/generic/mempcpy.c
index 46d19024b..c80caac8f 100644
--- a/libc/string/generic/mempcpy.c
+++ b/libc/string/generic/mempcpy.c
@@ -16,5 +16,5 @@ void *mempcpy (void *dstpp, const void *srcpp, size_t len)
   memcpy(dstpp, srcpp, len);
   return (void *)(((char *)dstpp) + len);
 }
-libc_hidden_def(mempcpy)
+libc_hidden_weak(mempcpy)
 #endif
diff --git a/libc/string/generic/memset.c b/libc/string/generic/memset.c
index 1df1a450f..50803cac5 100644
--- a/libc/string/generic/memset.c
+++ b/libc/string/generic/memset.c
@@ -83,4 +83,4 @@ void *memset (void *dstpp, int c, size_t len)
 
   return dstpp;
 }
-libc_hidden_def(memset)
+libc_hidden_weak(memset)
diff --git a/libc/string/generic/strchr.c b/libc/string/generic/strchr.c
index 8d401ec8c..985b78b5a 100644
--- a/libc/string/generic/strchr.c
+++ b/libc/string/generic/strchr.c
@@ -181,7 +181,7 @@ char *strchr (const char *s, int c_in)
 
   return NULL;
 }
-libc_hidden_def(strchr)
+libc_hidden_weak(strchr)
 #ifdef __UCLIBC_SUSV3_LEGACY__
-strong_alias(strchr,index)
+weak_alias(strchr,index)
 #endif
diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c
index acfefb6dc..21c896986 100644
--- a/libc/string/generic/strcmp.c
+++ b/libc/string/generic/strcmp.c
@@ -41,7 +41,7 @@ int strcmp (const char *p1, const char *p2)
 
   return c1 - c2;
 }
-libc_hidden_def(strcmp)
+libc_hidden_weak(strcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
 libc_hidden_proto(strcoll)
diff --git a/libc/string/generic/strlen.c b/libc/string/generic/strlen.c
index 3528829af..7e9b12fb9 100644
--- a/libc/string/generic/strlen.c
+++ b/libc/string/generic/strlen.c
@@ -149,4 +149,4 @@ size_t strlen (const char *str)
 	}
     }
 }
-libc_hidden_def(strlen)
+libc_hidden_weak(strlen)
diff --git a/libc/string/generic/strrchr.c b/libc/string/generic/strrchr.c
index 97192da95..fe7118a49 100644
--- a/libc/string/generic/strrchr.c
+++ b/libc/string/generic/strrchr.c
@@ -42,7 +42,7 @@ char *strrchr (const char *s, int c)
 
   return (char *) found;
 }
-libc_hidden_def(strrchr)
+libc_hidden_weak(strrchr)
 #ifdef __UCLIBC_SUSV3_LEGACY__
-strong_alias(strrchr,rindex)
+weak_alias(strrchr,rindex)
 #endif
-- 
cgit v1.2.3