24 files changed, 49 insertions, 56 deletions
diff --git a/libc/string/generic/memchr.c b/libc/string/generic/memchr.c
index 4bda5d758..3c7c997bc 100644
--- a/libc/string/generic/memchr.c
+++ b/libc/string/generic/memchr.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <limits.h>
 
-libc_hidden_proto(memchr)
+/* Experimentally off - libc_hidden_proto(memchr) */
 libc_hidden_proto(abort)
 
 #include "memcopy.h"
@@ -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..fc63a2eae 100644
--- a/libc/string/generic/memcmp.c
+++ b/libc/string/generic/memcmp.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "memcopy.h"
 
-libc_hidden_proto(memcmp)
+/* Experimentally off - libc_hidden_proto(memcmp) */
 
 #include <endian.h>
 
@@ -59,8 +59,7 @@ static int memcmp_bytes __P((op_t, op_t));
 __inline
 # endif
 static int
-memcmp_bytes (a, b)
-     op_t a, b;
+memcmp_bytes (op_t a, op_t b)
 {
   long int srcp1 = (long int) &a;
   long int srcp2 = (long int) &b;
@@ -84,10 +83,7 @@ static int memcmp_common_alignment __P((long, long, size_t));
    objects (not LEN bytes!).  Both SRCP1 and SRCP2 should be aligned for
    memory operations on `op_t's.  */
 static int
-memcmp_common_alignment (srcp1, srcp2, len)
-     long int srcp1;
-     long int srcp2;
-     size_t len;
+memcmp_common_alignment (long int srcp1, long int srcp2, size_t len)
 {
   op_t a0, a1;
   op_t b0, b1;
@@ -171,10 +167,7 @@ static int memcmp_not_common_alignment __P((long, long, size_t));
    `op_t' objects (not LEN bytes!).  SRCP2 should be aligned for memory
    operations on `op_t', but SRCP1 *should be unaligned*.  */
 static int
-memcmp_not_common_alignment (srcp1, srcp2, len)
-     long int srcp1;
-     long int srcp2;
-     size_t len;
+memcmp_not_common_alignment (long int srcp1, long int srcp2, size_t len)
 {
   op_t a0, a1, a2, a3;
   op_t b0, b1, b2, b3;
@@ -330,7 +323,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 c36c9da42..4284f2fe5 100644
--- a/libc/string/generic/memcpy.c
+++ b/libc/string/generic/memcpy.c
@@ -23,7 +23,7 @@
 #include "memcopy.h"
 #include "pagecopy.h"
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 void *memcpy (void *dstpp, const void *srcpp, size_t len)
 {
@@ -58,4 +58,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/memmem.c b/libc/string/generic/memmem.c
index 5d4e6f151..c75bb2426 100644
--- a/libc/string/generic/memmem.c
+++ b/libc/string/generic/memmem.c
@@ -20,8 +20,8 @@
 #include <stddef.h>
 
 #ifdef __USE_GNU
-libc_hidden_proto(memmem)
-libc_hidden_proto(memcmp)
+/* Experimentally off - libc_hidden_proto(memmem) */
+/* Experimentally off - libc_hidden_proto(memcmp) */
 
 /* Return the first occurrence of NEEDLE in HAYSTACK.  */
 void *memmem (const void *haystack, size_t haystack_len,
diff --git a/libc/string/generic/mempcpy.c b/libc/string/generic/mempcpy.c
index 46d19024b..8d7356486 100644
--- a/libc/string/generic/mempcpy.c
+++ b/libc/string/generic/mempcpy.c
@@ -8,13 +8,13 @@
 #include <string.h>
 
 #ifdef __USE_GNU
-libc_hidden_proto(mempcpy)
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(mempcpy) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 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/memrchr.c b/libc/string/generic/memrchr.c
index 43439d5ce..9ab805cf7 100644
--- a/libc/string/generic/memrchr.c
+++ b/libc/string/generic/memrchr.c
@@ -27,7 +27,7 @@
 #include <limits.h>
 
 #ifdef __USE_GNU
-libc_hidden_proto(memrchr)
+/* Experimentally off - libc_hidden_proto(memrchr) */
 libc_hidden_proto(abort)
 
 #include "memcopy.h"
diff --git a/libc/string/generic/memset.c b/libc/string/generic/memset.c
index 1df1a450f..62cc36fe3 100644
--- a/libc/string/generic/memset.c
+++ b/libc/string/generic/memset.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "memcopy.h"
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 void *memset (void *dstpp, int c, size_t len)
 {
   long int dstp = (long int) dstpp;
@@ -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/rawmemchr.c b/libc/string/generic/rawmemchr.c
index 6bf245265..f8b97a61d 100644
--- a/libc/string/generic/rawmemchr.c
+++ b/libc/string/generic/rawmemchr.c
@@ -26,7 +26,7 @@
 #include <limits.h>
 
 #ifdef __USE_GNU
-libc_hidden_proto(rawmemchr)
+/* Experimentally off - libc_hidden_proto(rawmemchr) */
 libc_hidden_proto(abort)
 
 #include "memcopy.h"
diff --git a/libc/string/generic/strcat.c b/libc/string/generic/strcat.c
index 53c4d0d9e..e00494038 100644
--- a/libc/string/generic/strcat.c
+++ b/libc/string/generic/strcat.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "memcopy.h"
 
-libc_hidden_proto(strcat)
+/* Experimentally off - libc_hidden_proto(strcat) */
 /* Append SRC on the end of DEST.  */
 char *strcat (char *dest, const char *src)
 {
diff --git a/libc/string/generic/strchr.c b/libc/string/generic/strchr.c
index 8d401ec8c..66aed1e25 100644
--- a/libc/string/generic/strchr.c
+++ b/libc/string/generic/strchr.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-libc_hidden_proto(strchr)
+/* Experimentally off - libc_hidden_proto(strchr) */
 libc_hidden_proto(abort)
 
 #include "memcopy.h"
@@ -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/strchrnul.c b/libc/string/generic/strchrnul.c
index 17e32ab44..72cab2891 100644
--- a/libc/string/generic/strchrnul.c
+++ b/libc/string/generic/strchrnul.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 #ifdef __USE_GNU
-libc_hidden_proto(strchrnul)
+/* Experimentally off - libc_hidden_proto(strchrnul) */
 libc_hidden_proto(abort)
 
 #include "memcopy.h"
diff --git a/libc/string/generic/strcmp.c b/libc/string/generic/strcmp.c
index acfefb6dc..50acd3548 100644
--- a/libc/string/generic/strcmp.c
+++ b/libc/string/generic/strcmp.c
@@ -20,7 +20,7 @@
 
 #include "memcopy.h"
 
-libc_hidden_proto(strcmp)
+/* Experimentally off - libc_hidden_proto(strcmp) */
 /* Compare S1 and S2, returning less than, equal to or
    greater than zero if S1 is lexicographically less than,
    equal to or greater than S2.  */
@@ -41,10 +41,10 @@ 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)
+/* Experimentally off - libc_hidden_proto(strcoll) */
 strong_alias(strcmp,strcoll)
 libc_hidden_def(strcoll)
 #endif
diff --git a/libc/string/generic/strcpy.c b/libc/string/generic/strcpy.c
index 7e558ead1..99e077139 100644
--- a/libc/string/generic/strcpy.c
+++ b/libc/string/generic/strcpy.c
@@ -22,7 +22,7 @@
 #include "memcopy.h"
 #include "bp-checks.h"
 
-libc_hidden_proto(strcpy)
+/* Experimentally off - libc_hidden_proto(strcpy) */
 /* Copy SRC to DEST.  */
 char *strcpy (char *dest, const char *src)
 {
diff --git a/libc/string/generic/strcspn.c b/libc/string/generic/strcspn.c
index 1b5e465ea..b65b3b995 100644
--- a/libc/string/generic/strcspn.c
+++ b/libc/string/generic/strcspn.c
@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-libc_hidden_proto(strcspn)
-libc_hidden_proto(strchr)
+/* Experimentally off - libc_hidden_proto(strcspn) */
+/* Experimentally off - libc_hidden_proto(strchr) */
 
 /* Return the length of the maximum initial segment of S
    which contains no characters from REJECT.  */
diff --git a/libc/string/generic/strlen.c b/libc/string/generic/strlen.c
index 3528829af..764dae18d 100644
--- a/libc/string/generic/strlen.c
+++ b/libc/string/generic/strlen.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(abort)
 
 /* Return the length of the null-terminated string STR.  Scan for
@@ -149,4 +149,4 @@ size_t strlen (const char *str)
 	}
     }
 }
-libc_hidden_def(strlen)
+libc_hidden_weak(strlen)
diff --git a/libc/string/generic/strncat.c b/libc/string/generic/strncat.c
index 9e0dfcd78..8e3423e49 100644
--- a/libc/string/generic/strncat.c
+++ b/libc/string/generic/strncat.c
@@ -20,7 +20,7 @@
 
 #include "memcopy.h"
 
-libc_hidden_proto(strncat)
+/* Experimentally off - libc_hidden_proto(strncat) */
 char *strncat (char *s1, const char *s2, size_t n)
 {
   reg_char c;
diff --git a/libc/string/generic/strncmp.c b/libc/string/generic/strncmp.c
index 12e0e4d17..c49f36d8b 100644
--- a/libc/string/generic/strncmp.c
+++ b/libc/string/generic/strncmp.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "memcopy.h"
 
-libc_hidden_proto(strncmp)
+/* Experimentally off - libc_hidden_proto(strncmp) */
 /* Compare no more than N characters of S1 and S2,
    returning less than, equal to or greater than zero
    if S1 is lexicographically less than, equal to or
diff --git a/libc/string/generic/strncpy.c b/libc/string/generic/strncpy.c
index 4b0b0894e..d2d693f2b 100644
--- a/libc/string/generic/strncpy.c
+++ b/libc/string/generic/strncpy.c
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "memcopy.h"
 
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(strncpy) */
 char *strncpy (char *s1, const char *s2, size_t n)
 {
   reg_char c;
diff --git a/libc/string/generic/strnlen.c b/libc/string/generic/strnlen.c
index 3156e469a..d9ba76129 100644
--- a/libc/string/generic/strnlen.c
+++ b/libc/string/generic/strnlen.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 #ifdef __USE_GNU
-libc_hidden_proto(strnlen)
+/* Experimentally off - libc_hidden_proto(strnlen) */
 libc_hidden_proto(abort)
 
 /* Find the length of S, but scan at most MAXLEN characters.  If no
diff --git a/libc/string/generic/strrchr.c b/libc/string/generic/strrchr.c
index 97192da95..c85707241 100644
--- a/libc/string/generic/strrchr.c
+++ b/libc/string/generic/strrchr.c
@@ -18,8 +18,8 @@
 
 #include <string.h>
 
-libc_hidden_proto(strrchr)
-libc_hidden_proto(strchr)
+/* Experimentally off - libc_hidden_proto(strrchr) */
+/* Experimentally off - libc_hidden_proto(strchr) */
 
 /* Find the last occurrence of C in S.  */
 char *strrchr (const char *s, int 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
diff --git a/libc/string/generic/strsep.c b/libc/string/generic/strsep.c
index 5cb1779d2..e02e57068 100644
--- a/libc/string/generic/strsep.c
+++ b/libc/string/generic/strsep.c
@@ -20,10 +20,10 @@
 
 #ifdef __USE_BSD
 
-libc_hidden_proto(strchr)
-libc_hidden_proto(strpbrk)
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strpbrk) */
 
-libc_hidden_proto(strsep)
+/* Experimentally off - libc_hidden_proto(strsep) */
 char *strsep (char **stringp, const char *delim)
 {
   char *begin, *end;
diff --git a/libc/string/generic/strspn.c b/libc/string/generic/strspn.c
index a194fdc7d..010567744 100644
--- a/libc/string/generic/strspn.c
+++ b/libc/string/generic/strspn.c
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-libc_hidden_proto(strspn)
+/* Experimentally off - libc_hidden_proto(strspn) */
 /* Return the length of the maximum initial segment
    of S which contains only characters in ACCEPT.  */
 size_t strspn (const char *s, const char *accept)
diff --git a/libc/string/generic/strstr.c b/libc/string/generic/strstr.c
index f151a820a..c12dceb33 100644
--- a/libc/string/generic/strstr.c
+++ b/libc/string/generic/strstr.c
@@ -28,7 +28,7 @@
 
 #include <string.h>
 
-libc_hidden_proto(strstr)
+/* Experimentally off - libc_hidden_proto(strstr) */
 
 typedef unsigned chartype;
 
diff --git a/libc/string/generic/strtok_r.c b/libc/string/generic/strtok_r.c
index bae394a80..d082d226e 100644
--- a/libc/string/generic/strtok_r.c
+++ b/libc/string/generic/strtok_r.c
@@ -19,15 +19,15 @@
 
 #include <string.h>
 
-libc_hidden_proto(strtok_r)
-libc_hidden_proto(strspn)
-libc_hidden_proto(strpbrk)
+/* Experimentally off - libc_hidden_proto(strtok_r) */
+/* Experimentally off - libc_hidden_proto(strspn) */
+/* Experimentally off - libc_hidden_proto(strpbrk) */
 #ifdef __USE_GNU
 # define __rawmemchr rawmemchr
-libc_hidden_proto(rawmemchr)
+/* Experimentally off - libc_hidden_proto(rawmemchr) */
 #else
 # define __rawmemchr strchr
-libc_hidden_proto(strchr)
+/* Experimentally off - libc_hidden_proto(strchr) */
 #endif
 
 /* Parse S into tokens separated by characters in DELIM.