14 files changed, 17 insertions, 15 deletions
diff --git a/libc/string/i386/memchr.c b/libc/string/i386/memchr.c
index 53a2af2bb..5994a4b67 100644
--- a/libc/string/i386/memchr.c
+++ b/libc/string/i386/memchr.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef memchr
 void attribute_hidden *__memchr(const void *cs, int c, size_t count)
 {
     int d0;
diff --git a/libc/string/i386/memcpy.c b/libc/string/i386/memcpy.c
index b2e0236f5..1cd234685 100644
--- a/libc/string/i386/memcpy.c
+++ b/libc/string/i386/memcpy.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef memcpy
 void attribute_hidden *__memcpy(void * to, const void * from, size_t n)
 {
     int d0, d1, d2;
diff --git a/libc/string/i386/memmove.c b/libc/string/i386/memmove.c
index 27f6cf264..4bc5f3e42 100644
--- a/libc/string/i386/memmove.c
+++ b/libc/string/i386/memmove.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef memmove
 void attribute_hidden *__memmove(void *dest, const void *src, size_t n)
 {
     int d0, d1, d2;
diff --git a/libc/string/i386/memset.c b/libc/string/i386/memset.c
index a35279643..0fd9e2019 100644
--- a/libc/string/i386/memset.c
+++ b/libc/string/i386/memset.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef memset
 void attribute_hidden *__memset(void *s, int c, size_t count)
 {
     int d0, d1;
diff --git a/libc/string/i386/strcat.c b/libc/string/i386/strcat.c
index 8e4447ee0..eb3c81ec1 100644
--- a/libc/string/i386/strcat.c
+++ b/libc/string/i386/strcat.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef strcat
 char attribute_hidden *__strcat(char * dest, const char * src)
 {
     int d0, d1, d2, d3;
diff --git a/libc/string/i386/strchr.c b/libc/string/i386/strchr.c
index 075c65c39..5fe689d1a 100644
--- a/libc/string/i386/strchr.c
+++ b/libc/string/i386/strchr.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef strchr
 char attribute_hidden *__strchr(const char *s, int c)
 {
     int d0;
diff --git a/libc/string/i386/strcmp.c b/libc/string/i386/strcmp.c
index 4744fdf4e..4db824dbd 100644
--- a/libc/string/i386/strcmp.c
+++ b/libc/string/i386/strcmp.c
@@ -30,10 +30,10 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #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;
@@ -57,5 +57,6 @@ int attribute_hidden __strcmp(const char *cs, const char *ct)
 strong_alias(__strcmp, strcmp)
 
 #ifdef __LOCALE_C_ONLY
-weak_alias(strcmp, strcoll)
+weak_alias(__strcmp, __strcoll)
+strong_alias(__strcoll, strcoll)
 #endif /* __LOCALE_C_ONLY */
diff --git a/libc/string/i386/strcpy.c b/libc/string/i386/strcpy.c
index cb923aaba..1b9bcfded 100644
--- a/libc/string/i386/strcpy.c
+++ b/libc/string/i386/strcpy.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef strcpy
 char attribute_hidden *__strcpy(char * dest, const char * src)
 {
     int d0, d1, d2;
diff --git a/libc/string/i386/strlen.c b/libc/string/i386/strlen.c
index 1371acbeb..859d0928c 100644
--- a/libc/string/i386/strlen.c
+++ b/libc/string/i386/strlen.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef strlen
 size_t attribute_hidden __strlen(const char *s)
 {
     int d0;
diff --git a/libc/string/i386/strncat.c b/libc/string/i386/strncat.c
index 39a22766d..b57568166 100644
--- a/libc/string/i386/strncat.c
+++ b/libc/string/i386/strncat.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef strncat
 char attribute_hidden *__strncat(char * dest, 
 	const char * src, size_t count)
 {
diff --git a/libc/string/i386/strncmp.c b/libc/string/i386/strncmp.c
index 86b317fb8..825980d4d 100644
--- a/libc/string/i386/strncmp.c
+++ b/libc/string/i386/strncmp.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef strncmp
 int attribute_hidden __strncmp(const char *cs, const char *ct, size_t count)
 {
     register int __res;
diff --git a/libc/string/i386/strncpy.c b/libc/string/i386/strncpy.c
index 1e7257e95..db135ee4a 100644
--- a/libc/string/i386/strncpy.c
+++ b/libc/string/i386/strncpy.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef strncpy
 char attribute_hidden *__strncpy(char * dest, const char * src, size_t count)
 {
     int d0, d1, d2, d3;
diff --git a/libc/string/i386/strnlen.c b/libc/string/i386/strnlen.c
index be7ace51d..4fceedf51 100644
--- a/libc/string/i386/strnlen.c
+++ b/libc/string/i386/strnlen.c
@@ -33,6 +33,7 @@
 #define _GNU_SOURCE
 #include <string.h>
 
+#undef strnlen
 size_t attribute_hidden __strnlen(const char *s, size_t count)
 {
     int d0;
diff --git a/libc/string/i386/strrchr.c b/libc/string/i386/strrchr.c
index 626a12777..8468ee511 100644
--- a/libc/string/i386/strrchr.c
+++ b/libc/string/i386/strrchr.c
@@ -30,9 +30,9 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
+#undef strrchr
 char attribute_hidden *__strrchr(const char *s, int c)
 {
     int d0, d1;
@@ -51,4 +51,4 @@ char attribute_hidden *__strrchr(const char *s, int c)
 
 strong_alias(__strrchr, strrchr)
 
-weak_alias(__strrchr, rindex)
+weak_alias(strrchr, rindex)