2 files changed, 3 insertions, 30 deletions
diff --git a/libc/string/frv/Makefile b/libc/string/frv/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/frv/Makefile
+++ b/libc/string/frv/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/frv/Makefile.arch b/libc/string/frv/Makefile.arch
deleted file mode 100644
index a864e8d1a..000000000
--- a/libc/string/frv/Makefile.arch
+++ /dev/null
@@ -1,27 +0,0 @@
-# Makefile for uClibc
-#
-# Copyright (C) 2004 Alexandre Oliva <aoliva@redhat.com>
-# 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
-
-STRING_ARCH_DIR:=$(top_srcdir)libc/string/frv
-STRING_ARCH_OUT:=$(top_builddir)libc/string/frv
-
-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}