5 files changed, 8 insertions, 8 deletions
diff --git a/libc/string/cris/memcpy.c b/libc/string/cris/memcpy.c
index a85108109..0cce37a30 100644
--- a/libc/string/cris/memcpy.c
+++ b/libc/string/cris/memcpy.c
@@ -66,7 +66,7 @@
 
 void *memcpy(void *, const void *, unsigned int);
 
-libc_hidden_proto(memcpy)
+/* Experimentally off - libc_hidden_proto(memcpy) */
 void *memcpy(void *pdst,
              const void *psrc,
              unsigned int pn)
@@ -130,7 +130,7 @@ void *memcpy(void *pdst,
      here (beware: they may be moved to temporary registers).
       This way, we do not have to save/move the registers around into
      temporaries; we can safely use them straight away.  */
-    __asm__ volatile ("\
+    __asm__ __volatile__ ("\
 	.syntax no_register_prefix					\n\
 									\n\
         ;; Check that the register asm declaration got right.		\n\
diff --git a/libc/string/cris/memmove.c b/libc/string/cris/memmove.c
index 437637078..b6620afe0 100644
--- a/libc/string/cris/memmove.c
+++ b/libc/string/cris/memmove.c
@@ -27,7 +27,7 @@
 #include "memcopy.h"
 #include "../generic/pagecopy.h"
 
-libc_hidden_proto(memmove)
+/* Experimentally off - libc_hidden_proto(memmove) */
 void *memmove (void *dest, const void *src, size_t len)
 {
   unsigned long int dstp = (long int) dest;
diff --git a/libc/string/cris/memset.c b/libc/string/cris/memset.c
index 7e71bc50f..9cc959a33 100644
--- a/libc/string/cris/memset.c
+++ b/libc/string/cris/memset.c
@@ -59,7 +59,7 @@
 
 void *memset(void *, int, unsigned long);
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 void *memset(void *pdst,
              int c,
              unsigned long plen)
@@ -124,7 +124,7 @@ void *memset(void *pdst,
      here (beware: they may be moved to temporary registers).
       This way, we do not have to save/move the registers around into
      temporaries; we can safely use them straight away.  */
-    __asm__ volatile ("								\n\
+    __asm__ __volatile__ ("								\n\
 	.syntax no_register_prefix						\n\
 										\n\
         ;; Check that the register asm declaration got right.			\n\
diff --git a/libc/string/cris/strcpy.c b/libc/string/cris/strcpy.c
index 0af25253e..955a990b7 100644
--- a/libc/string/cris/strcpy.c
+++ b/libc/string/cris/strcpy.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 
-libc_hidden_proto(strcpy)
+/* Experimentally off - libc_hidden_proto(strcpy) */
 char *strcpy(char *dest, const char *src)
 {
   char *ret = dest;
diff --git a/libc/string/cris/strncpy.c b/libc/string/cris/strncpy.c
index 93a6608bc..3f2775bdd 100644
--- a/libc/string/cris/strncpy.c
+++ b/libc/string/cris/strncpy.c
@@ -6,9 +6,9 @@
 
 #include <string.h>
 
-libc_hidden_proto(memset)
+/* Experimentally off - libc_hidden_proto(memset) */
 
-libc_hidden_proto(strncpy)
+/* Experimentally off - libc_hidden_proto(strncpy) */
 char *strncpy(char *dest, const char *src, size_t count)
 {
   char *ret = dest;