6 files changed, 23 insertions, 54 deletions
diff --git a/libc/string/sh64/Makefile b/libc/string/sh64/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/sh64/Makefile
+++ b/libc/string/sh64/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/sh64/Makefile.arch b/libc/string/sh64/Makefile.arch
deleted file mode 100644
index f246864f6..000000000
--- a/libc/string/sh64/Makefile.arch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org>
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
-#
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-#
-
-SSRC:=memcpy.S memset.S strcpy.S strlen.S
-
-STRING_ARCH_DIR:=$(top_srcdir)libc/string/sh64
-STRING_ARCH_OUT:=$(top_builddir)libc/string/sh64
-
-STRING_ARCH_SRC:=$(patsubst %.S,$(STRING_ARCH_DIR)/%.S,$(SSRC))
-STRING_ARCH_OBJ:=$(patsubst %.S,$(STRING_ARCH_OUT)/%.o,$(SSRC))
-
-STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ)
-
-libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS)
-libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os)
-
-libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS)
-
-objclean-y+=string_arch_objclean
-
-string_arch_objclean:
-	$(RM) $(STRING_ARCH_OUT)/*.{o,os}
diff --git a/libc/string/sh64/memcpy.S b/libc/string/sh64/memcpy.S
index d74980613..3c0ea0c0d 100644
--- a/libc/string/sh64/memcpy.S
+++ b/libc/string/sh64/memcpy.S
@@ -39,12 +39,11 @@
 #include <features.h>
 
 	.section .text..SHmedia32,"ax"
-	.globl	__memcpy
-	.hidden	__memcpy
-	.type	__memcpy, @function
+	.globl	memcpy
+	.type	memcpy, @function
 	.align	5
 
-__memcpy:
+memcpy:
 
 #define LDUAQ(P,O,D0,D1) ldlo.q P,O,D0; ldhi.q P,O+7,D1
 #define STUAQ(P,O,D0,D1) stlo.q P,O,D0; sthi.q P,O+7,D1
@@ -201,6 +200,6 @@ Loop_ua:
 	stlo.q r5, 8, r1
 	blink tr1, r63
 
-	.size __memcpy,.-__memcpy
+	.size memcpy,.-memcpy
 
-strong_alias(__memcpy,memcpy)
+libc_hidden_def(memcpy)
diff --git a/libc/string/sh64/memset.S b/libc/string/sh64/memset.S
index cd2ad7998..f588323f0 100644
--- a/libc/string/sh64/memset.S
+++ b/libc/string/sh64/memset.S
@@ -21,13 +21,12 @@
 #endif
 
 	.section .text..SHmedia32,"ax"
-	.globl	__memset
-	.hidden	__memset
-	.type	__memset, @function
+	.globl	memset
+	.type	memset, @function
 
 	.align 5
 
-__memset:
+memset:
 	pta/l multiquad, tr0
 	andi r2, 7, r22
 	ptabs r18, tr2
@@ -92,6 +91,6 @@ loop:
 	sthi.q r5, -1, r3
 	blink tr2,r63
 
-	.size	__memset,.-__memset
+	.size	memset,.-memset
 
-strong_alias(__memset,memset)
+libc_hidden_def(memset)
diff --git a/libc/string/sh64/strcpy.S b/libc/string/sh64/strcpy.S
index 2ce998257..da79d5143 100644
--- a/libc/string/sh64/strcpy.S
+++ b/libc/string/sh64/strcpy.S
@@ -18,12 +18,11 @@
 #endif
 
 	.section .text..SHmedia32,"ax"
-	.globl	__strcpy
-	.hidden	__strcpy
-	.type	__strcpy, @function
+	.globl	strcpy
+	.type	strcpy, @function
 	.align 5
 
-__strcpy:
+strcpy:
 
 	pta/l shortstring,tr1
 	ldlo.q r3,0,r4
@@ -98,6 +97,6 @@ loop:
 	addi r0, 8, r0
 	blink tr1, r63 // shortstring
 
-	.size	__strcpy,.-__strcpy
+	.size	strcpy,.-strcpy
 
-strong_alias(__strcpy,strcpy)
+libc_hidden_def(strcpy)
diff --git a/libc/string/sh64/strlen.S b/libc/string/sh64/strlen.S
index 673a34dbd..18f4164ff 100644
--- a/libc/string/sh64/strlen.S
+++ b/libc/string/sh64/strlen.S
@@ -33,12 +33,11 @@
 #include <features.h>
 
 	.section .text..SHmedia32,"ax"
-	.globl	__strlen
-	.hidden	__strlen
-	.type	__strlen,@function
+	.globl	strlen
+	.type	strlen,@function
 
 	.balign 16
-__strlen:
+strlen:
 	ptabs	r18, tr4
 
 	/*
@@ -59,6 +58,6 @@ loop:
 	or	r0, r63, r2
 	blink	tr4, r63
 
-	.size	__strlen,.-__strlen
+	.size	strlen,.-strlen
 
-strong_alias(__strlen,strlen)
+libc_hidden_def(strlen)