5 files changed, 16 insertions, 37 deletions

diff --git a/libc/string/powerpc/Makefile b/libc/string/powerpc/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/powerpc/Makefile
+++ b/libc/string/powerpc/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/powerpc/Makefile.arch b/libc/string/powerpc/Makefile.arch
deleted file mode 100644
index 47a8dac1d..000000000
--- a/libc/string/powerpc/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/powerpc
-STRING_ARCH_OUT:=$(top_builddir)libc/string/powerpc
-
-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/powerpc/memcpy.c b/libc/string/powerpc/memcpy.c
index 5af96869b..ed8022313 100644
--- a/libc/string/powerpc/memcpy.c
+++ b/libc/string/powerpc/memcpy.c
@@ -21,7 +21,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)
 /* PPC can do pre increment and load/store, but not post increment and load/store.
    Therefore use *++ptr instead of *ptr++. */
 {
@@ -76,5 +77,4 @@ void attribute_hidden *__memcpy(void *to, const void *from, size_t n)
 		goto copy_chunks;
 	goto lessthan8;
 }
-
-strong_alias(__memcpy,memcpy)
+libc_hidden_def(memcpy)
diff --git a/libc/string/powerpc/memmove.c b/libc/string/powerpc/memmove.c
index 1d513a966..327161116 100644
--- a/libc/string/powerpc/memmove.c
+++ b/libc/string/powerpc/memmove.c
@@ -21,14 +21,17 @@
 
 #include <string.h>
 
-void attribute_hidden *__memmove(void *to, const void *from, size_t n)
+libc_hidden_proto(memcpy)
+
+libc_hidden_proto(memmove)
+void *memmove(void *to, const void *from, size_t n)
 {
 	unsigned long rem, chunks, tmp1, tmp2;
 	unsigned char *tmp_to;
 	unsigned char *tmp_from = (unsigned char *)from;
 
 	if (tmp_from >= (unsigned char *)to)
-		return __memcpy(to, from, n);
+		return memcpy(to, from, n);
 	chunks = n / 8;
 	tmp_from += n;
 	tmp_to = to + n;
@@ -72,5 +75,4 @@ void attribute_hidden *__memmove(void *to, const void *from, size_t n)
 		goto copy_chunks;
 	goto lessthan8;
 }
-
-strong_alias(__memmove,memmove)
+libc_hidden_def(memmove)
diff --git a/libc/string/powerpc/memset.c b/libc/string/powerpc/memset.c
index f6cda9579..891e0b8aa 100644
--- a/libc/string/powerpc/memset.c
+++ b/libc/string/powerpc/memset.c
@@ -21,6 +21,8 @@
 
 #include <string.h>
 
+libc_hidden_proto(memset)
+
 static inline int expand_byte_word(int c){
 	/* this does: 
 	   c = c << 8 | c;
@@ -32,7 +34,7 @@ static inline int expand_byte_word(int c){
 	return c;
 }
 
-void attribute_hidden *__memset(void *to, int c, size_t n)
+void *memset(void *to, int c, size_t n)
 {
 	unsigned long rem, chunks;
 	unsigned char *tmp_to;
@@ -78,5 +80,4 @@ void attribute_hidden *__memset(void *to, int c, size_t n)
 		goto copy_chunks;
 	goto lessthan8;
 }
-
-strong_alias(__memset,memset)
+libc_hidden_def(memset)