Moving libc_hidden_proto's into #ifdef UCLIBC_INTERNAL block

in string.h and strings.h. This caught unguarded string ops in
libc/inet/ethers.c __ether_line_w() function.

I will wait for fallout reports for a week or so,
then continue converting more libc_hidden_proto's.

include/string.h

@@ -434,4 +434,125 @@ extern size_t strlcpy(char *__restrict dst, const char *__restrict src,
 
 __END_DECLS
 
+
+#ifdef UCLIBC_INTERNAL
+/* In the same order and with the same defines */
+libc_hidden_proto(memcpy)
+libc_hidden_proto(memmove)
+#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN
+libc_hidden_proto(memccpy)
+#endif /* SVID.  */
+libc_hidden_proto(memset)
+libc_hidden_proto(memcmp)
+libc_hidden_proto(memchr)
+#ifdef	__USE_GNU
+libc_hidden_proto(rawmemchr)
+libc_hidden_proto(memrchr)
+#endif
+libc_hidden_proto(strcpy)
+libc_hidden_proto(strncpy)
+libc_hidden_proto(strcat)
+libc_hidden_proto(strncat)
+libc_hidden_proto(strcmp)
+libc_hidden_proto(strncmp)
+libc_hidden_proto(strcoll)
+libc_hidden_proto(strxfrm)
+#if defined __USE_GNU && defined __UCLIBC_HAS_XLOCALE__
+libc_hidden_proto(strcoll_l)
+libc_hidden_proto(strxfrm_l)
+#endif
+#if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
+libc_hidden_proto(strdup)
+#endif
+#if defined __USE_GNU
+libc_hidden_proto(strndup)
+#endif
+libc_hidden_proto(strchr)
+libc_hidden_proto(strrchr)
+#ifdef	__USE_GNU
+libc_hidden_proto(strchrnul)
+#endif
+libc_hidden_proto(strcspn)
+libc_hidden_proto(strspn)
+libc_hidden_proto(strpbrk)
+libc_hidden_proto(strstr)
+libc_hidden_proto(strtok)
+#if 0 /* uClibc: disabled */
+libc_hidden_proto(__strtok_r)
+#endif
+#if defined __USE_POSIX || defined __USE_MISC
+libc_hidden_proto(strtok_r)
+#endif
+#ifdef	__USE_GNU
+libc_hidden_proto(strcasestr)
+#endif
+#ifdef	__USE_GNU
+libc_hidden_proto(memmem)
+#if 0 /* uClibc: disabled */
+libc_hidden_proto(__mempcpy)
+#endif
+libc_hidden_proto(mempcpy)
+#endif
+libc_hidden_proto(strlen)
+#ifdef	__USE_GNU
+libc_hidden_proto(strnlen)
+#endif
+libc_hidden_proto(strerror)
+/* TODO: insert strerror_r mess here */
+#if 0 /* uClibc: disabled */
+libc_hidden_proto(__bzero)
+#endif
+#ifdef	__USE_BSD
+# ifdef __UCLIBC_SUSV3_LEGACY__
+libc_hidden_proto(bcopy)
+libc_hidden_proto(bzero)
+libc_hidden_proto(bcmp)
+libc_hidden_proto(index)
+libc_hidden_proto(rindex)
+# endif
+libc_hidden_proto(ffs)
+#if 0 /*def	__USE_GNU*/
+libc_hidden_proto(ffsl)
+#  ifdef __GNUC__
+libc_hidden_proto(ffsll)
+#  endif
+# endif
+libc_hidden_proto(strcasecmp)
+libc_hidden_proto(strncasecmp)
+#endif /* Use BSD.  */
+#if defined __USE_GNU && defined __UCLIBC_HAS_XLOCALE__
+libc_hidden_proto(strcasecmp_l)
+libc_hidden_proto(strncasecmp_l)
+#endif
+#ifdef	__USE_BSD
+libc_hidden_proto(strsep)
+#endif
+#ifdef	__USE_GNU
+#if 0
+libc_hidden_proto(strverscmp)
+#endif
+libc_hidden_proto(strsignal)
+#if 0 /* uClibc: disabled */
+libc_hidden_proto(__stpcpy)
+#endif
+libc_hidden_proto(stpcpy)
+#if 0 /* uClibc: disabled */
+libc_hidden_proto(__stpncpy)
+#endif
+libc_hidden_proto(stpncpy)
+#if 0 /* uClibc does not support strfry or memfrob. */
+libc_hidden_proto(strfry)
+libc_hidden_proto(memfrob)
+#endif
+# ifndef basename
+libc_hidden_proto(basename)
+# endif
+#endif
+#ifdef	__USE_BSD
+libc_hidden_proto(strlcat)
+libc_hidden_proto(strlcpy)
+#endif
+#endif
+
+
 #endif /* string.h  */

include/strings.h

@@ -90,6 +90,28 @@ extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n)
 
 __END_DECLS
 
+
+#ifdef UCLIBC_INTERNAL
+/* In the same order and with the same defines */
+# ifdef __UCLIBC_SUSV3_LEGACY__
+libc_hidden_proto(bcopy)
+libc_hidden_proto(bzero)
+libc_hidden_proto(bcmp)
+libc_hidden_proto(index)
+libc_hidden_proto(rindex)
+# endif
+libc_hidden_proto(ffs)
+# if 0 /*def	__USE_GNU*/
+libc_hidden_proto(ffsl)
+#  ifdef __GNUC__
+libc_hidden_proto(ffsll)
+#  endif
+# endif
+libc_hidden_proto(strcasecmp)
+libc_hidden_proto(strncasecmp)
+#endif
+
+
 #endif	/* string.h  */
 
 #endif	/* strings.h  */

libc/inet/addr.c

@@ -156,7 +156,7 @@ libc_hidden_def(inet_ntoa)
 #ifdef L_inet_makeaddr
 
 /* for some reason it does not remove the jump relocation */
-libc_hidden_proto(memmove)
+/* Experimentally off - libc_hidden_proto(memmove) */
 
 /*
  * Formulate an Internet address from network + host.  Used in

libc/inet/getaddrinfo.c

@@ -67,13 +67,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/utsname.h>
 #include <net/if.h>
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
 /* libc_hidden_proto(strcmp) */
 /* libc_hidden_proto(stpcpy) */
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(socket)
 libc_hidden_proto(close)
 libc_hidden_proto(getservbyname_r)

libc/inet/getnetbynm.c

@@ -20,7 +20,7 @@
 #include <netdb.h>
 #include <string.h>
 
-libc_hidden_proto(strcmp)
+/* Experimentally off - libc_hidden_proto(strcmp) */
 libc_hidden_proto(setnetent)
 libc_hidden_proto(getnetent)
 libc_hidden_proto(endnetent)

libc/inet/getproto.c

@@ -63,8 +63,8 @@
 #include <errno.h>
 
 libc_hidden_proto(fopen)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strpbrk)
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strpbrk) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets)

libc/inet/getservice.c

@@ -64,8 +64,8 @@
 #include <arpa/inet.h>
 #include <errno.h>
 
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strpbrk)
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strpbrk) */
 libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)
 libc_hidden_proto(atoi)

libc/inet/hostid.c

@@ -15,7 +15,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(open)
 libc_hidden_proto(close)
 libc_hidden_proto(read)

libc/inet/if_index.c

@@ -35,12 +35,12 @@
 
 #include "netlinkaccess.h"
 
-libc_hidden_proto(strncpy)
-libc_hidden_proto(strdup)
+/* Experimentally off - libc_hidden_proto(strncpy) */
+/* Experimentally off - libc_hidden_proto(strdup) */
 libc_hidden_proto(ioctl)
 libc_hidden_proto(close)
 #if __ASSUME_NETLINK_SUPPORT
-libc_hidden_proto(strndup)
+/* Experimentally off - libc_hidden_proto(strndup) */
 #endif
 
 extern int __opensock(void) attribute_hidden;

libc/inet/ifaddrs.c

@@ -45,8 +45,8 @@ libc_hidden_proto(close)
 libc_hidden_proto(sendto)
 libc_hidden_proto(recvmsg)
 libc_hidden_proto(bind)
-libc_hidden_proto(memset)
-libc_hidden_proto(mempcpy)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(mempcpy) */
 libc_hidden_proto(getsockname)
 libc_hidden_proto(fclose)
 libc_hidden_proto(abort)

libc/inet/ntop.c

@@ -30,11 +30,11 @@
 #include <string.h>
 #include <ctype.h>
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(sprintf)
 libc_hidden_proto(tolower)
 

libc/inet/resolv.c

@@ -168,19 +168,19 @@
 
 __UCLIBC_MUTEX_EXTERN(__resolv_lock);
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
-libc_hidden_proto(memmove)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strdup)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strncat)
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(memmove) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strdup) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strncat) */
+/* Experimentally off - libc_hidden_proto(strncpy) */
 /* libc_hidden_proto(strnlen) */
-libc_hidden_proto(strstr)
-libc_hidden_proto(strcasecmp)
+/* Experimentally off - libc_hidden_proto(strstr) */
+/* Experimentally off - libc_hidden_proto(strcasecmp) */
 libc_hidden_proto(socket)
 libc_hidden_proto(close)
 libc_hidden_proto(fopen)

libc/inet/rpc/auth_unix.c

@@ -56,7 +56,7 @@
 # include <wchar.h>
 #endif
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(sysconf)
 libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)

libc/inet/rpc/bindresvport.c

@@ -40,7 +40,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(bind)
 libc_hidden_proto(getpid)
 

libc/inet/rpc/clnt_generic.c

@@ -40,10 +40,10 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
 libc_hidden_proto(clnttcp_create)
 libc_hidden_proto(clntudp_create)
 libc_hidden_proto(clntunix_create)

libc/inet/rpc/clnt_perror.c

@@ -51,8 +51,8 @@ static char sccsid[] = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(sprintf)
 libc_hidden_proto(__glibc_strerror_r)
 libc_hidden_proto(fputs)

libc/inet/rpc/clnt_simple.c

@@ -50,9 +50,9 @@ static char sccsid[] = "@(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
 #include <netdb.h>
 #include <string.h>
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(close)
 libc_hidden_proto(clntudp_create)
 libc_hidden_proto(gethostbyname_r)

libc/inet/rpc/clnt_udp.c

@@ -62,7 +62,7 @@ libc_hidden_proto(fwprintf)
 #include <sys/uio.h>
 #endif
 
-libc_hidden_proto(memcmp)
+/* Experimentally off - libc_hidden_proto(memcmp) */
 libc_hidden_proto(ioctl)
 libc_hidden_proto(socket)
 libc_hidden_proto(close)

libc/inet/rpc/clnt_unix.c

@@ -63,8 +63,8 @@
 libc_hidden_proto(fwprintf)
 #endif
 
-libc_hidden_proto(strlen)
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(socket)
 libc_hidden_proto(close)
 libc_hidden_proto(getpid)

libc/inet/rpc/getrpcent.c

@@ -44,11 +44,11 @@
 #include <arpa/inet.h>
 #include <errno.h>
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)
 libc_hidden_proto(atoi)

libc/inet/rpc/getrpcport.c

@@ -48,7 +48,7 @@ static  char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
 #include <rpc/pmap_clnt.h>
 #include <sys/socket.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(pmap_getport)
 libc_hidden_proto(gethostbyname_r)
 

libc/inet/rpc/pmap_rmt.c

@@ -59,7 +59,7 @@ static char sccsid[] = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
 #include <arpa/inet.h>
 #define MAX_BROADCAST_SIZE 1400
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(ioctl)
 libc_hidden_proto(perror)
 libc_hidden_proto(socket)

libc/inet/rpc/rcmd.c

@@ -87,14 +87,14 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #endif
 #include <sys/uio.h>
 
-libc_hidden_proto(memcmp)
-libc_hidden_proto(strcat)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strncmp)
-libc_hidden_proto(memmove)
+/* Experimentally off - libc_hidden_proto(memcmp) */
+/* Experimentally off - libc_hidden_proto(strcat) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strncmp) */
+/* Experimentally off - libc_hidden_proto(memmove) */
 libc_hidden_proto(getpid)
 libc_hidden_proto(socket)
 libc_hidden_proto(close)

libc/inet/rpc/rexec.c

@@ -42,9 +42,9 @@
 #include <string.h>
 #include <unistd.h>
 
-libc_hidden_proto(memset)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(read)
 libc_hidden_proto(write)
 libc_hidden_proto(close)

libc/inet/rpc/rpc_cmsg.c

@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
 #include <sys/param.h>
 #include <rpc/rpc.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(xdr_enum)
 libc_hidden_proto(xdr_opaque)
 libc_hidden_proto(xdr_u_int)

libc/inet/rpc/ruserpass.c

@@ -44,13 +44,13 @@
 #include <strings.h>
 #include <unistd.h>
 
-libc_hidden_proto(strcat)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strcasecmp)
-libc_hidden_proto(strncasecmp)
+/* Experimentally off - libc_hidden_proto(strcat) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strcasecmp) */
+/* Experimentally off - libc_hidden_proto(strncasecmp) */
 libc_hidden_proto(getenv)
 libc_hidden_proto(printf)
 libc_hidden_proto(fstat)

libc/inet/rpc/svc.c

@@ -46,7 +46,7 @@
 #include <rpc/pmap_clnt.h>
 #include <sys/poll.h>
 
-libc_hidden_proto(ffs)
+/* Experimentally off - libc_hidden_proto(ffs) */
 libc_hidden_proto(pmap_set)
 libc_hidden_proto(pmap_unset)
 libc_hidden_proto(_authenticate)

libc/inet/rpc/svc_authux.c

@@ -46,7 +46,7 @@
 #include <rpc/rpc.h>
 #include <rpc/svc.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(printf)
 libc_hidden_proto(xdrmem_create)
 libc_hidden_proto(xdr_authunix_parms)

libc/inet/rpc/svc_simple.c

@@ -55,8 +55,8 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-libc_hidden_proto(strdup)
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(strdup) */
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(asprintf)
 libc_hidden_proto(fputs)
 libc_hidden_proto(write)

libc/inet/rpc/svc_tcp.c

@@ -59,8 +59,8 @@ static char sccsid[] = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
 # define fputs(s, f) _IO_fputs (s, f)
 #endif
 
-libc_hidden_proto(memset)
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(socket)
 libc_hidden_proto(close)
 libc_hidden_proto(read)

libc/inet/rpc/svc_udp.c

@@ -60,9 +60,9 @@ static char sccsid[] = "@(#)svc_udp.c 1.24 87/08/11 Copyr 1984 Sun Micro";
 libc_hidden_proto(fwprintf)
 #endif
 
-libc_hidden_proto(memcmp)
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memcmp) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(perror)
 libc_hidden_proto(socket)
 libc_hidden_proto(close)

libc/inet/rpc/svc_unix.c

@@ -55,9 +55,9 @@
 # include <wchar.h>
 #endif
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(socket)
 libc_hidden_proto(close)
 libc_hidden_proto(perror)

libc/inet/rpc/xdr.c

@@ -56,7 +56,7 @@ static char sccsid[] = "@(#)xdr.c 1.35 87/08/12";
 libc_hidden_proto(fwprintf)
 #endif
 
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(fputs)
 
 /*

libc/inet/rpc/xdr_array.c

@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 libc_hidden_proto(fwprintf)
 #endif
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(fputs)
 libc_hidden_proto(xdr_u_int)
 

libc/inet/rpc/xdr_mem.c

@@ -43,7 +43,7 @@
 #include <limits.h>
 #include <rpc/rpc.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static bool_t xdrmem_getlong (XDR *, long *);
 static bool_t xdrmem_putlong (XDR *, const long *);

libc/inet/rpc/xdr_rec.c

@@ -60,7 +60,7 @@
 libc_hidden_proto(fwprintf)
 #endif
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(fputs)
 libc_hidden_proto(lseek)
 

libc/inet/rpc/xdr_reference.c

@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
 libc_hidden_proto(fwprintf)
 #endif
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(xdr_bool)
 libc_hidden_proto(fputs)
 

libc/misc/dirent/alphasort.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include "dirstream.h"
 
-libc_hidden_proto(strcmp)
+/* Experimentally off - libc_hidden_proto(strcmp) */
 
 int alphasort(const void * a, const void * b)
 {

libc/misc/dirent/alphasort64.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include "dirstream.h"
 
-libc_hidden_proto(strcmp)
+/* Experimentally off - libc_hidden_proto(strcmp) */
 
 int alphasort64(const void * a, const void * b)
 {

libc/misc/dirent/readdir64_r.c

@@ -14,7 +14,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 libc_hidden_proto(readdir64_r)
 int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)

libc/misc/dirent/readdir_r.c

@@ -11,7 +11,7 @@
 #include <dirent.h>
 #include "dirstream.h"
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 libc_hidden_proto(readdir_r)
 int readdir_r(DIR *dir, struct dirent *entry, struct dirent **result)

libc/misc/dirent/scandir.c

@@ -12,7 +12,7 @@
 #include <sys/types.h>
 #include "dirstream.h"
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(readdir)
 libc_hidden_proto(opendir)
 libc_hidden_proto(closedir)

libc/misc/dirent/scandir64.c

@@ -30,7 +30,7 @@
 #include <sys/types.h>
 #include "dirstream.h"
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(opendir)
 libc_hidden_proto(closedir)
 libc_hidden_proto(qsort)

libc/misc/error/error.c

@@ -26,8 +26,8 @@
 #include <string.h>
 #include <error.h>
 
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strerror)
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strerror) */
 libc_hidden_proto(fprintf)
 libc_hidden_proto(exit)
 libc_hidden_proto(putc)

libc/misc/file/lockf.c

@@ -26,7 +26,7 @@
 
 libc_hidden_proto(lockf)
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(fcntl)
 libc_hidden_proto(getpid)
 

libc/misc/file/lockf64.c

@@ -37,7 +37,7 @@ libc_hidden_proto(fcntl64)
 libc_hidden_proto(fcntl)
 #endif
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(getpid)
 
 /* lockf is a simplified interface to fcntl's locking facilities.  */

libc/misc/fnmatch/fnmatch.c

@@ -54,15 +54,15 @@
 
 #ifdef __UCLIBC__
 #define __memset memset
-libc_hidden_proto(memchr)
-libc_hidden_proto(memset)
-libc_hidden_proto(mempcpy)
-libc_hidden_proto(strcat)
-libc_hidden_proto(strcmp)
+/* Experimentally off - libc_hidden_proto(memchr) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(mempcpy) */
+/* Experimentally off - libc_hidden_proto(strcat) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
 /*libc_hidden_proto(strchr)*/
 /*libc_hidden_proto(strchrnul)*/
-libc_hidden_proto(strlen)
-libc_hidden_proto(strcoll)
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strcoll) */
 #ifdef __UCLIBC_HAS_XLOCALE__
 libc_hidden_proto(__ctype_b_loc)
 libc_hidden_proto(__ctype_tolower_loc)

libc/misc/ftw/ftw.c

@@ -83,9 +83,9 @@ char *alloca ();
 # include <sys/stat.h>
 #endif
 
-libc_hidden_proto(memset)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(dirfd)
 libc_hidden_proto(tsearch)
 libc_hidden_proto(tfind)
@@ -93,7 +93,7 @@ libc_hidden_proto(tdestroy)
 libc_hidden_proto(getcwd)
 libc_hidden_proto(chdir)
 libc_hidden_proto(fchdir)
-libc_hidden_proto(mempcpy)
+/* Experimentally off - libc_hidden_proto(mempcpy) */
 libc_hidden_proto(opendir)
 #ifdef __UCLIBC_HAS_LFS__
 libc_hidden_proto(readdir64)
@@ -101,7 +101,7 @@ libc_hidden_proto(lstat64)
 libc_hidden_proto(stat64)
 #endif
 libc_hidden_proto(closedir)
-libc_hidden_proto(stpcpy)
+/* Experimentally off - libc_hidden_proto(stpcpy) */
 libc_hidden_proto(lstat)
 libc_hidden_proto(stat)
 

libc/misc/glob/glob-susv3.c

@@ -23,12 +23,12 @@
 #include <unistd.h>
 #include <stdio.h>
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(strcat)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(strcat) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(opendir)
 libc_hidden_proto(closedir)
 libc_hidden_proto(qsort)

libc/misc/glob/glob.c

@@ -33,17 +33,17 @@
 
 libc_hidden_proto(closedir)
 libc_hidden_proto(fnmatch)
-libc_hidden_proto(memcpy)
-libc_hidden_proto(mempcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(mempcpy) */
 libc_hidden_proto(opendir)
 libc_hidden_proto(qsort)
 libc_hidden_proto(readdir)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcoll)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strdup)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strrchr)
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcoll) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strdup) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strrchr) */
 
 
 #ifdef ENABLE_GLOB_TILDE_EXPANSION

libc/misc/internals/__uClibc_main.c

@@ -31,10 +31,10 @@
 libc_hidden_proto(exit)
 
 #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__
-libc_hidden_proto(strrchr)
+/* Experimentally off - libc_hidden_proto(strrchr) */
 #endif
 #ifndef __ARCH_HAS_NO_LDSO__
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(getgid)
 libc_hidden_proto(getuid)
 libc_hidden_proto(getegid)

libc/misc/internals/tempname.c

@@ -45,8 +45,8 @@
 #include <sys/time.h>
 #include "tempname.h"
 
-libc_hidden_proto(strlen)
-libc_hidden_proto(strcmp)
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
 libc_hidden_proto(sprintf)
 libc_hidden_proto(mkdir)
 libc_hidden_proto(open)

libc/misc/locale/locale.c

@@ -58,14 +58,14 @@
 #include <ctype.h>
 #include <stdio.h>
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
-libc_hidden_proto(strtok_r)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strncmp)
-libc_hidden_proto(strchr)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strtok_r) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strncmp) */
+/* Experimentally off - libc_hidden_proto(strchr) */
 libc_hidden_proto(getenv)
 #ifdef __UCLIBC_HAS_CTYPE_TABLES__
 libc_hidden_proto(__C_ctype_toupper)
@@ -193,7 +193,7 @@ static const char utf8[] = "UTF-8";
  */
 static char hr_locale[(MAX_LOCALE_CATEGORY_STR * LC_ALL) + MAX_LOCALE_STR];
 
-libc_hidden_proto(stpcpy)
+/* Experimentally off - libc_hidden_proto(stpcpy) */
 libc_hidden_proto(newlocale)
 
 static void update_hr_locale(const unsigned char *spec)
@@ -1084,7 +1084,7 @@ libc_hidden_def(__XL_NPP(nl_langinfo))
 /**********************************************************************/
 #ifdef L_newlocale
 
-libc_hidden_proto(stpcpy)
+/* Experimentally off - libc_hidden_proto(stpcpy) */
 libc_hidden_proto(newlocale)
 
 #ifdef __UCLIBC_MJN3_ONLY__

libc/misc/mntent/mntent.c

@@ -17,8 +17,8 @@ libc_hidden_proto(getmntent_r)
 libc_hidden_proto(setmntent)
 libc_hidden_proto(endmntent)
 
-libc_hidden_proto(strstr)
-libc_hidden_proto(strtok_r)
+/* Experimentally off - libc_hidden_proto(strstr) */
+/* Experimentally off - libc_hidden_proto(strtok_r) */
 libc_hidden_proto(atoi)
 libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)

libc/misc/regex/regex.c

@@ -78,19 +78,19 @@ libc_hidden_proto(isascii)
 #endif
 libc_hidden_proto(toupper)
 libc_hidden_proto(tolower)
-libc_hidden_proto(memcmp)
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memmove)
-libc_hidden_proto(memset)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(memcmp) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memmove) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(getenv)
-libc_hidden_proto(strcasecmp)
+/* Experimentally off - libc_hidden_proto(strcasecmp) */
 libc_hidden_proto(abort)
 #ifdef __USE_GNU
-libc_hidden_proto(mempcpy)
+/* Experimentally off - libc_hidden_proto(mempcpy) */
 #endif
 
 #endif

libc/misc/regex/regex_old.c

@@ -38,15 +38,15 @@
 #include <malloc.h>
 #include <stdio.h>
 
-libc_hidden_proto(memset)
-libc_hidden_proto(memcmp)
-libc_hidden_proto(memcpy)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(memcmp) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(printf)
 libc_hidden_proto(abort)
 #ifdef __USE_GNU
-libc_hidden_proto(mempcpy)
+/* Experimentally off - libc_hidden_proto(mempcpy) */
 #endif
 libc_hidden_proto(__uc_malloc)
 

libc/misc/search/_hsearch_r.c

@@ -135,8 +135,8 @@ libc_hidden_def(hdestroy_r)
    equality of the stored and the parameter value. This helps to prevent
    unnecessary expensive calls of strcmp.  */
 
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 
 libc_hidden_proto(hsearch_r)
 int hsearch_r (ENTRY item, ACTION action, ENTRY **retval,

libc/misc/search/_lsearch.c

@@ -34,7 +34,7 @@ libc_hidden_def(lfind)
 
 #ifdef L_lsearch
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 void *lsearch(const void *key, void *base, size_t *nmemb, 
 	size_t size, int (*compar)(const void *, const void *))

libc/misc/statfs/fstatfs64.c

@@ -25,7 +25,7 @@
 #include <sys/statvfs.h>
 #include <stddef.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(fstatfs)
 
 /* Return information about the filesystem on which FD resides.  */

libc/misc/statfs/fstatvfs.c

@@ -27,9 +27,9 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-libc_hidden_proto(memset)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strsep)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strsep) */
 libc_hidden_proto(setmntent)
 libc_hidden_proto(getmntent_r)
 libc_hidden_proto(endmntent)

libc/misc/statfs/fstatvfs64.c

@@ -28,9 +28,9 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-libc_hidden_proto(memset)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strsep)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strsep) */
 libc_hidden_proto(setmntent)
 libc_hidden_proto(getmntent_r)
 libc_hidden_proto(endmntent)

libc/misc/statfs/statfs64.c

@@ -24,7 +24,7 @@
 #include <sys/statfs.h>
 
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(statfs)
 
 /* Return information about the filesystem on which FILE resides.  */

libc/misc/statfs/statvfs.c

@@ -27,9 +27,9 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-libc_hidden_proto(memset)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strsep)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strsep) */
 libc_hidden_proto(setmntent)
 libc_hidden_proto(getmntent_r)
 libc_hidden_proto(endmntent)

libc/misc/statfs/statvfs64.c

@@ -28,9 +28,9 @@
 #include <sys/statfs.h>
 #include <sys/statvfs.h>
 
-libc_hidden_proto(memset)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strsep)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strsep) */
 libc_hidden_proto(setmntent)
 libc_hidden_proto(getmntent_r)
 libc_hidden_proto(endmntent)

libc/misc/syslog/syslog.c

@@ -84,12 +84,12 @@ libc_hidden_proto(syslog)
 libc_hidden_proto(vsyslog)
 libc_hidden_proto(closelog)
 
-libc_hidden_proto(memset)
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memmove)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memmove) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(open)
 libc_hidden_proto(fcntl)
 libc_hidden_proto(socket)

libc/misc/time/time.c

@@ -161,12 +161,12 @@ libc_hidden_proto(ctime)
 libc_hidden_proto(localtime)
 libc_hidden_proto(localtime_r)
 
-libc_hidden_proto(memset)
-libc_hidden_proto(memcpy)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strncpy) */
 /* libc_hidden_proto(sprintf) */
 libc_hidden_proto(open)
 libc_hidden_proto(read)
@@ -174,13 +174,13 @@ libc_hidden_proto(close)
 libc_hidden_proto(getenv)
 libc_hidden_proto(tzset)
 libc_hidden_proto(gettimeofday)
-libc_hidden_proto(strncasecmp)
+/* Experimentally off - libc_hidden_proto(strncasecmp) */
 libc_hidden_proto(strtol)
 libc_hidden_proto(strtoul)
 libc_hidden_proto(nl_langinfo)
 
 #ifdef __UCLIBC_HAS_XLOCALE__
-libc_hidden_proto(strncasecmp_l)
+/* Experimentally off - libc_hidden_proto(strncasecmp_l) */
 libc_hidden_proto(strtol_l)
 libc_hidden_proto(strtoul_l)
 libc_hidden_proto(nl_langinfo_l)
@@ -619,7 +619,7 @@ libc_hidden_def(localtime_r)
 
 #ifdef __UCLIBC_HAS_TM_EXTENSIONS__
 
-libc_hidden_proto(strnlen)
+/* Experimentally off - libc_hidden_proto(strnlen) */
 
 struct ll_tzname_item;
 

libc/misc/ttyent/getttyent.c

@@ -39,9 +39,9 @@
 #include <pthread.h>
 #endif
 
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strncmp)
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strncmp) */
 libc_hidden_proto(__fsetlocking)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets_unlocked)

libc/misc/utmp/utent.c

@@ -21,9 +21,9 @@
 #include <string.h>
 #include <utmp.h>
 
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strdup)
-libc_hidden_proto(strncmp)
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strdup) */
+/* Experimentally off - libc_hidden_proto(strncmp) */
 libc_hidden_proto(read)
 libc_hidden_proto(write)
 libc_hidden_proto(open)

libc/misc/utmp/wtent.c

@@ -15,8 +15,8 @@
 #include <sys/file.h>
 
 #if 0
-libc_hidden_proto(memset)
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strncpy) */
 libc_hidden_proto(updwtmp)
 #endif
 libc_hidden_proto(open)

libc/misc/wchar/wchar.c

@@ -1268,7 +1268,7 @@ const unsigned char __iconv_codesets[] =
 	"\x07\x01""ASCII";			/* Must be last! (special case to save a nul) */
 libc_hidden_data_def(__iconv_codesets)
 
-libc_hidden_proto(strcasecmp)
+/* Experimentally off - libc_hidden_proto(strcasecmp) */
 
 static int find_codeset(const char *name)
 {

libc/misc/wctype/_wctype.c

@@ -37,7 +37,7 @@
 #include <stdint.h>
 #include <bits/uClibc_uwchar.h>
 
-libc_hidden_proto(strcmp)
+/* Experimentally off - libc_hidden_proto(strcmp) */
 libc_hidden_proto(tolower)
 libc_hidden_proto(toupper)
 libc_hidden_proto(towlower)

libc/misc/wordexp/wordexp.c

@@ -35,15 +35,15 @@
 #include <glob.h>
 #include <wordexp.h>
 
-libc_hidden_proto(mempcpy)
-libc_hidden_proto(stpcpy)
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strdup)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strndup)
-libc_hidden_proto(strspn)
-libc_hidden_proto(strcspn)
+/* Experimentally off - libc_hidden_proto(mempcpy) */
+/* Experimentally off - libc_hidden_proto(stpcpy) */
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strdup) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strndup) */
+/* Experimentally off - libc_hidden_proto(strspn) */
+/* Experimentally off - libc_hidden_proto(strcspn) */
 libc_hidden_proto(setenv)
 libc_hidden_proto(unsetenv)
 libc_hidden_proto(waitpid)

libc/pwd_grp/lckpwdf.c

@@ -28,7 +28,7 @@
 #include <paths.h>
 #include <shadow.h>
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(open)
 libc_hidden_proto(fcntl)
 libc_hidden_proto(close)

libc/pwd_grp/pwd_grp.c

@@ -37,10 +37,10 @@
 #endif
 #include <bits/uClibc_mutex.h>
 
-libc_hidden_proto(strchr)
-libc_hidden_proto(strcmp)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(strchr) */
+/* Experimentally off - libc_hidden_proto(strcmp) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(strtoul)
 libc_hidden_proto(rewind)
 libc_hidden_proto(fgets_unlocked)

libc/signal/sigaction.c

@@ -23,7 +23,7 @@
 
 #include <sys/syscall.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* The difference here is that the sigaction structure used in the
    kernel is not the same as we use in the libc.  Therefore we must

libc/signal/sigempty.c

@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <string.h>
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 
 /* Clear all signals from SET.  */
 libc_hidden_proto(sigemptyset)

libc/signal/sigfillset.c

@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <string.h>
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 
 /* Set all signals in SET.  */
 libc_hidden_proto(sigfillset)

libc/stdio/_fpmaxtostr.c

@@ -11,7 +11,7 @@
 #include <locale.h>
 #include <bits/uClibc_fpmax.h>
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 
 typedef size_t (__fp_outfunc_t)(FILE *fp, intptr_t type, intptr_t len,
 								intptr_t buf);

libc/stdio/_fwrite.c

@@ -7,9 +7,9 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(memchr)
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memrchr)
+/* Experimentally off - libc_hidden_proto(memchr) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memrchr) */
 
 #ifdef __STDIO_BUFFERS
 

libc/stdio/_scanf.c

@@ -77,10 +77,10 @@
 #include <bits/uClibc_fpmax.h>
 #endif /* __UCLIBC_HAS_FLOATS__ */
 
-libc_hidden_proto(memcmp)
-libc_hidden_proto(memset)
-libc_hidden_proto(strcpy)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memcmp) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strcpy) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(ungetc)
 libc_hidden_proto(vfscanf)
 libc_hidden_proto(vsscanf)

libc/stdio/_stdio.c

@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(isatty)
 
 /* This is pretty much straight from uClibc, but with one important

libc/stdio/_uintmaxtostr.c

@@ -11,7 +11,7 @@
 #include <locale.h>
 #include <bits/uClibc_uintmaxtostr.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* Avoid using long long / and % operations to cut down dependencies on
  * libgcc.a.  Definitely helps on i386 at least. */

libc/stdio/_vfprintf.c

@@ -117,10 +117,10 @@
 #include <bits/uClibc_uintmaxtostr.h>
 #include <bits/uClibc_va_copy.h>
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
-libc_hidden_proto(strlen)
-libc_hidden_proto(strnlen)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strnlen) */
 libc_hidden_proto(__glibc_strerror_r)
 libc_hidden_proto(fputs_unlocked)
 libc_hidden_proto(abort)

libc/stdio/ctermid.c

@@ -7,7 +7,7 @@
 
 #include "_stdio.h"
 
-libc_hidden_proto(strcpy)
+/* Experimentally off - libc_hidden_proto(strcpy) */
 
 char *ctermid(register char *s)
 {

libc/stdio/fmemopen.c

@@ -10,7 +10,7 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(fopencookie)
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__

libc/stdio/fputs.c

@@ -9,7 +9,7 @@
 
 libc_hidden_proto(fputs_unlocked)
 
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(strlen) */
 libc_hidden_proto(fwrite_unlocked)
 
 /* Note: The standard says fputs returns a nonnegative number on

libc/stdio/fread.c

@@ -11,7 +11,7 @@ libc_hidden_proto(fread_unlocked)
 
 #ifdef __DO_UNLOCKED
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(fflush_unlocked)
 
 size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb,

libc/stdio/old_vfprintf.c

@@ -145,9 +145,9 @@
 #include <pthread.h>
 #endif /* __UCLIBC_HAS_THREADS__ */
 
-libc_hidden_proto(strlen)
-libc_hidden_proto(strnlen)
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(strlen) */
+/* Experimentally off - libc_hidden_proto(strnlen) */
+/* Experimentally off - libc_hidden_proto(memcpy) */
 libc_hidden_proto(putc_unlocked)
 libc_hidden_proto(__fputc_unlocked)
 libc_hidden_proto(__glibc_strerror_r)

libc/stdio/open_memstream.c

@@ -10,8 +10,8 @@
 #ifdef __USE_GNU
 #include "_stdio.h"
 
-libc_hidden_proto(memcpy)
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memcpy) */
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(fopencookie)
 
 #ifndef __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__

libc/stdio/tempnam.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include "../misc/internals/tempname.h"
 
-libc_hidden_proto(strdup)
+/* Experimentally off - libc_hidden_proto(strdup) */
 
 /* Generate a unique temporary filename using up to five characters of PFX
    if it is not NULL.  The directory to put this file in is searched for

libc/stdio/tmpnam.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include "../misc/internals/tempname.h"
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 static char tmpnam_buffer[L_tmpnam];
 

libc/stdlib/_strtod.c

@@ -215,7 +215,7 @@ __fpmax_t attribute_hidden __strtofpmax(const Wchar *str, Wchar **endptr, int ex
 
 #else  /* defined(__UCLIBC_HAS_XLOCALE__) && !defined(__UCLIBC_DO_XLOCALE) */
 
-libc_hidden_proto(memcmp)
+/* Experimentally off - libc_hidden_proto(memcmp) */
 
 __fpmax_t attribute_hidden __XL_NPP(__strtofpmax)(const Wchar *str, Wchar **endptr, int exponent_power
 								 __LOCALE_PARAM )

libc/stdlib/abort.c

@@ -29,7 +29,7 @@ Cambridge, MA 02139, USA.  */
 
 libc_hidden_proto(abort)
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 libc_hidden_proto(sigaction)
 libc_hidden_proto(sigprocmask)
 libc_hidden_proto(raise)

libc/stdlib/bsd_getpt.c

@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 libc_hidden_proto(open)
-libc_hidden_proto(mempcpy)
+/* Experimentally off - libc_hidden_proto(mempcpy) */
 
 /* Prefix for master pseudo terminal nodes.  */
 #define _PATH_PTY "/dev/pty"

libc/stdlib/getenv.c

@@ -9,8 +9,8 @@
 #include <stdlib.h>
 
 libc_hidden_proto(getenv)
-libc_hidden_proto(memcmp)
-libc_hidden_proto(strlen)
+/* Experimentally off - libc_hidden_proto(memcmp) */
+/* Experimentally off - libc_hidden_proto(strlen) */
 
 /* IEEE Std 1003.1-2001 says getenv need not be thread safe, so 
  * don't bother locking access to __environ */

libc/stdlib/malloc-simple/alloc.c

@@ -17,7 +17,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 /*libc_hidden_proto(memset)*/
 libc_hidden_proto(mmap)
 libc_hidden_proto(munmap)

libc/stdlib/malloc-standard/calloc.c

@@ -16,7 +16,7 @@
 
 #include "malloc.h"
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 
 /* ------------------------------ calloc ------------------------------ */
 void* calloc(size_t n_elements, size_t elem_size)

libc/stdlib/malloc-standard/realloc.c

@@ -17,7 +17,7 @@
 #include "malloc.h"
 
 libc_hidden_proto(mremap)
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 /* ------------------------------ realloc ------------------------------ */
 void* realloc(void* oldmem, size_t bytes)

libc/stdlib/malloc/calloc.c

@@ -22,7 +22,7 @@
 #include <string.h>
 #include <errno.h>
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 
 void * calloc(size_t nmemb, size_t lsize)
 {

libc/stdlib/malloc/realloc.c

@@ -15,7 +15,7 @@
 #include <string.h>
 #include <errno.h>
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 
 #include "malloc.h"
 #include "heap.h"