16 files changed, 50 insertions, 76 deletions
diff --git a/libc/string/i386/Makefile b/libc/string/i386/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/i386/Makefile
+++ b/libc/string/i386/Makefile
@@ -5,9 +5,9 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-top_srcdir=../../../
-top_builddir=../../../
+top_srcdir:=../../../
+top_builddir:=../../../
 all: objs
 include $(top_builddir)Rules.mak
-include Makefile.arch
+include ../Makefile.in
 include $(top_srcdir)Makerules
diff --git a/libc/string/i386/Makefile.arch b/libc/string/i386/Makefile.arch
deleted file mode 100644
index 27a29dd16..000000000
--- a/libc/string/i386/Makefile.arch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
-#
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-#
-
-STRING_ARCH_DIR:=$(top_srcdir)libc/string/i386
-STRING_ARCH_OUT:=$(top_builddir)libc/string/i386
-
-STRING_ARCH_CSRC:=$(wildcard $(STRING_ARCH_DIR)/*.c)
-STRING_ARCH_COBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_CSRC))
-
-STRING_ARCH_OBJS:=$(STRING_ARCH_COBJ)
-
-libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS)
-libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os)
-
-libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_CSRC)
-
-objclean-y+=string_arch_objclean
-
-string_arch_objclean:
-	$(RM) $(STRING_ARCH_OUT)/*.{o,os}
diff --git a/libc/string/i386/memchr.c b/libc/string/i386/memchr.c
index c7cd33758..229d42919 100644
--- a/libc/string/i386/memchr.c
+++ b/libc/string/i386/memchr.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-void attribute_hidden *__memchr(const void *cs, int c, size_t count)
+libc_hidden_proto(memchr)
+void *memchr(const void *cs, int c, size_t count)
 {
     int d0;
     register void * __res;
@@ -47,5 +48,4 @@ void attribute_hidden *__memchr(const void *cs, int c, size_t count)
 	    :"=D" (__res), "=&c" (d0) : "a" (c),"0" (cs),"1" (count));
     return __res;
 }
-
-strong_alias(__memchr,memchr)
+libc_hidden_def(memchr)
diff --git a/libc/string/i386/memcpy.c b/libc/string/i386/memcpy.c
index 12ba8d7de..a2b8d3d8c 100644
--- a/libc/string/i386/memcpy.c
+++ b/libc/string/i386/memcpy.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-void attribute_hidden *__memcpy(void * to, const void * from, size_t n)
+libc_hidden_proto(memcpy)
+void *memcpy(void * to, const void * from, size_t n)
 {
     int d0, d1, d2;
     __asm__ __volatile__(
@@ -49,5 +50,4 @@ void attribute_hidden *__memcpy(void * to, const void * from, size_t n)
 	    : "memory");
     return (to);
 }
-
-strong_alias(__memcpy,memcpy)
+libc_hidden_def(memcpy)
diff --git a/libc/string/i386/memmove.c b/libc/string/i386/memmove.c
index d6e29e553..a26fe2be1 100644
--- a/libc/string/i386/memmove.c
+++ b/libc/string/i386/memmove.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-void attribute_hidden *__memmove(void *dest, const void *src, size_t n)
+libc_hidden_proto(memmove)
+void *memmove(void *dest, const void *src, size_t n)
 {
     int d0, d1, d2;
     if (dest<src)
@@ -55,5 +56,4 @@ void attribute_hidden *__memmove(void *dest, const void *src, size_t n)
 		:"memory");
     return dest;
 }
-
-strong_alias(__memmove,memmove)
+libc_hidden_def(memmove)
diff --git a/libc/string/i386/memset.c b/libc/string/i386/memset.c
index eadbf9feb..eea48040a 100644
--- a/libc/string/i386/memset.c
+++ b/libc/string/i386/memset.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-void attribute_hidden *__memset(void *s, int c, size_t count)
+libc_hidden_proto(memset)
+void *memset(void *s, int c, size_t count)
 {
     int d0, d1;
     __asm__ __volatile__(
@@ -43,5 +44,4 @@ void attribute_hidden *__memset(void *s, int c, size_t count)
 	    :"memory");
     return s;
 }
-
-strong_alias(__memset,memset)
+libc_hidden_def(memset)
diff --git a/libc/string/i386/strcat.c b/libc/string/i386/strcat.c
index 02b2a3c5b..e0b1f3b51 100644
--- a/libc/string/i386/strcat.c
+++ b/libc/string/i386/strcat.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-char attribute_hidden *__strcat(char * dest, const char * src)
+libc_hidden_proto(strcat)
+char *strcat(char * dest, const char * src)
 {
     int d0, d1, d2, d3;
     __asm__ __volatile__(
@@ -47,5 +48,4 @@ char attribute_hidden *__strcat(char * dest, const char * src)
 	    : "0" (src), "1" (dest), "2" (0), "3" (0xffffffff):"memory");
     return dest;
 }
-
-strong_alias(__strcat,strcat)
+libc_hidden_def(strcat)
diff --git a/libc/string/i386/strchr.c b/libc/string/i386/strchr.c
index a8343fa00..5ed87e816 100644
--- a/libc/string/i386/strchr.c
+++ b/libc/string/i386/strchr.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-char attribute_hidden *__strchr(const char *s, int c)
+libc_hidden_proto(strchr)
+char *strchr(const char *s, int c)
 {
     int d0;
     register char * __res;
@@ -49,7 +50,5 @@ char attribute_hidden *__strchr(const char *s, int c)
 	    :"=a" (__res), "=&S" (d0) : "1" (s),"0" (c));
     return __res;
 }
-
-strong_alias(__strchr,strchr)
-
-strong_alias(__strchr,index)
+libc_hidden_def(strchr)
+strong_alias(strchr,index)
diff --git a/libc/string/i386/strcmp.c b/libc/string/i386/strcmp.c
index f335da646..47635d817 100644
--- a/libc/string/i386/strcmp.c
+++ b/libc/string/i386/strcmp.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-int attribute_hidden __strcmp(const char *cs, const char *ct)
+libc_hidden_proto(strcmp)
+int strcmp(const char *cs, const char *ct)
 {
     int d0, d1;
     register int __res;
@@ -51,10 +52,10 @@ int attribute_hidden __strcmp(const char *cs, const char *ct)
 	    :"1" (cs),"2" (ct));
     return __res;
 }
-
-strong_alias(__strcmp,strcmp)
+libc_hidden_def(strcmp)
 
 #ifndef __UCLIBC_HAS_LOCALE__
-hidden_strong_alias(__strcmp,__strcoll)
-strong_alias(__strcmp,strcoll)
+libc_hidden_proto(strcoll)
+strong_alias(strcmp,strcoll)
+libc_hidden_def(strcoll)
 #endif
diff --git a/libc/string/i386/strcpy.c b/libc/string/i386/strcpy.c
index 59effd45e..9e2b81009 100644
--- a/libc/string/i386/strcpy.c
+++ b/libc/string/i386/strcpy.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-char attribute_hidden *__strcpy(char * dest, const char * src)
+libc_hidden_proto(strcpy)
+char *strcpy(char * dest, const char * src)
 {
     int d0, d1, d2;
     __asm__ __volatile__(
@@ -44,5 +45,4 @@ char attribute_hidden *__strcpy(char * dest, const char * src)
 	    :"0" (src),"1" (dest) : "memory");
     return dest;
 }
-
-strong_alias(__strcpy,strcpy)
+libc_hidden_def(strcpy)
diff --git a/libc/string/i386/strlen.c b/libc/string/i386/strlen.c
index 01cc46f9e..f0767b600 100644
--- a/libc/string/i386/strlen.c
+++ b/libc/string/i386/strlen.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-size_t attribute_hidden __strlen(const char *s)
+libc_hidden_proto(strlen)
+size_t strlen(const char *s)
 {
     int d0;
     register int __res;
@@ -44,5 +45,4 @@ size_t attribute_hidden __strlen(const char *s)
 	    :"=c" (__res), "=&D" (d0) :"1" (s),"a" (0), "0" (0xffffffff));
     return __res;
 }
-
-strong_alias(__strlen,strlen)
+libc_hidden_def(strlen)
diff --git a/libc/string/i386/strncat.c b/libc/string/i386/strncat.c
index b55b87b59..c1061421e 100644
--- a/libc/string/i386/strncat.c
+++ b/libc/string/i386/strncat.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-char attribute_hidden *__strncat(char * dest, 
+libc_hidden_proto(strncat)
+char *strncat(char * dest, 
 	const char * src, size_t count)
 {
     int d0, d1, d2, d3;
@@ -57,5 +58,4 @@ char attribute_hidden *__strncat(char * dest,
 	    : "memory");
     return dest;
 }
-
-strong_alias(__strncat,strncat)
+libc_hidden_def(strncat)
diff --git a/libc/string/i386/strncmp.c b/libc/string/i386/strncmp.c
index 2e22bf642..0c42134e1 100644
--- a/libc/string/i386/strncmp.c
+++ b/libc/string/i386/strncmp.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-int attribute_hidden __strncmp(const char *cs, const char *ct, size_t count)
+libc_hidden_proto(strncmp)
+int strncmp(const char *cs, const char *ct, size_t count)
 {
     register int __res;
     int d0, d1, d2;
@@ -54,5 +55,4 @@ int attribute_hidden __strncmp(const char *cs, const char *ct, size_t count)
 	    :"1" (cs),"2" (ct),"3" (count));
     return __res;
 }
-
-strong_alias(__strncmp,strncmp)
+libc_hidden_def(strncmp)
diff --git a/libc/string/i386/strncpy.c b/libc/string/i386/strncpy.c
index 272c60ee4..c061fe37e 100644
--- a/libc/string/i386/strncpy.c
+++ b/libc/string/i386/strncpy.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-char attribute_hidden *__strncpy(char * dest, const char * src, size_t count)
+libc_hidden_proto(strncpy)
+char *strncpy(char * dest, const char * src, size_t count)
 {
     int d0, d1, d2, d3;
     __asm__ __volatile__(
@@ -52,5 +53,4 @@ char attribute_hidden *__strncpy(char * dest, const char * src, size_t count)
 	    :"0" (src),"1" (dest),"2" (count) : "memory");
     return dest;
 }
-
-strong_alias(__strncpy,strncpy)
+libc_hidden_def(strncpy)
diff --git a/libc/string/i386/strnlen.c b/libc/string/i386/strnlen.c
index ef5c83a9a..af512f10a 100644
--- a/libc/string/i386/strnlen.c
+++ b/libc/string/i386/strnlen.c
@@ -30,10 +30,10 @@
  *  -Erik
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 
-size_t attribute_hidden __strnlen(const char *s, size_t count)
+libc_hidden_proto(strnlen)
+size_t strnlen(const char *s, size_t count)
 {
     int d0;
     register int __res;
@@ -51,5 +51,4 @@ size_t attribute_hidden __strnlen(const char *s, size_t count)
 	    :"c" (s),"1" (count));
     return __res;
 }
-
-strong_alias(__strnlen,strnlen)
+libc_hidden_def(strnlen)
diff --git a/libc/string/i386/strrchr.c b/libc/string/i386/strrchr.c
index 9f0f65a36..7af990bd7 100644
--- a/libc/string/i386/strrchr.c
+++ b/libc/string/i386/strrchr.c
@@ -32,7 +32,8 @@
 
 #include <string.h>
 
-char attribute_hidden *__strrchr(const char *s, int c)
+libc_hidden_proto(strrchr)
+char *strrchr(const char *s, int c)
 {
     int d0, d1;
     register char * __res;
@@ -47,7 +48,5 @@ char attribute_hidden *__strrchr(const char *s, int c)
 	    :"=g" (__res), "=&S" (d0), "=&a" (d1) :"0" (0),"1" (s),"2" (c));
     return __res;
 }
-
-strong_alias(__strrchr,strrchr)
-
-strong_alias(__strrchr,rindex)
+libc_hidden_def(strrchr)
+strong_alias(strrchr,rindex)