19 files changed, 71 insertions, 271 deletions
diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in
index 4f96b8354..f11f5bc4d 100644
--- a/libc/string/Makefile.in
+++ b/libc/string/Makefile.in
@@ -1,14 +1,54 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-# order is relevant
--include $(top_srcdir)libc/string/$(TARGET_ARCH)/Makefile.arch
-include $(top_srcdir)libc/string/generic/Makefile.in
+#
+# Arch specific fun
+#
+STRING_ARCH_DIR:=$(top_srcdir)libc/string/$(TARGET_ARCH)
+STRING_ARCH_OUT:=$(top_builddir)libc/string/$(TARGET_ARCH)
+
+STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c)
+STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC))
+
+STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S)
+STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC))
+
+STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ)
+
+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_SRC)
+libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SOBJ)
+
+#
+# Generic stuff
+#
+STRING_GENERIC_DIR:=$(top_srcdir)libc/string/generic
+STRING_GENERIC_OUT:=$(top_builddir)libc/string/generic
+
+STRING_GENERIC_SRC:=$(wildcard $(STRING_GENERIC_DIR)/*.c)
 
+ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y)
+ifneq ($(strip $(STRING_ARCH_OBJS)),)
+STRING_GENERIC_SRC:=$(filter-out $(patsubst %.o,$(STRING_GENERIC_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_GENERIC_SRC))
+endif
+endif
+
+STRING_GENERIC_OBJS:=$(patsubst $(STRING_GENERIC_DIR)/%.c,$(STRING_GENERIC_OUT)/%.o,$(STRING_GENERIC_SRC))
+
+libc-a-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS)
+libc-so-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS:.o=.os)
+
+libc-multi-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_SRC)
+
+#
+# Top level string
+#
 STRING_DIR:=$(top_srcdir)libc/string
 STRING_OUT:=$(top_builddir)libc/string
 
diff --git a/libc/string/arm/Makefile b/libc/string/arm/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/arm/Makefile
+++ b/libc/string/arm/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/arm/Makefile.arch b/libc/string/arm/Makefile.arch
deleted file mode 100644
index 4b2550ee2..000000000
--- a/libc/string/arm/Makefile.arch
+++ /dev/null
@@ -1,27 +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.
-#
-
-SSRC:=	_memcpy.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \
-	strcmp.S strlen.S strncmp.S
-
-STRING_ARCH_DIR:=$(top_srcdir)libc/string/arm
-STRING_ARCH_OUT:=$(top_builddir)libc/string/arm
-
-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/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}
diff --git a/libc/string/generic/Makefile b/libc/string/generic/Makefile
index 4a8f4a072..0a95346fd 100644
--- a/libc/string/generic/Makefile
+++ b/libc/string/generic/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.in
+include ../Makefile.in
 include $(top_srcdir)Makerules
diff --git a/libc/string/generic/Makefile.in b/libc/string/generic/Makefile.in
deleted file mode 100644
index 82910172a..000000000
--- a/libc/string/generic/Makefile.in
+++ /dev/null
@@ -1,29 +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_GENERIC_DIR:=$(top_srcdir)libc/string/generic
-STRING_GENERIC_OUT:=$(top_builddir)libc/string/generic
-
-STRING_GENERIC_SRC:=$(wildcard $(STRING_GENERIC_DIR)/*.c)
-
-ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y)
-ifneq ($(strip $(STRING_ARCH_OBJS)),)
-STRING_GENERIC_SRC:=$(filter-out $(patsubst %.o,$(STRING_GENERIC_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_GENERIC_SRC))
-endif
-endif
-
-STRING_GENERIC_OBJS:=$(patsubst $(STRING_GENERIC_DIR)/%.c,$(STRING_GENERIC_OUT)/%.o,$(STRING_GENERIC_SRC))
-
-libc-a-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS)
-libc-so-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS:.o=.os)
-
-libc-multi-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_SRC)
-
-objclean-y+=string_generic_objclean
-
-string_generic_objclean:
-	$(RM) $(STRING_GENERIC_OUT)/*.{o,os}
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/mips/Makefile b/libc/string/mips/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/mips/Makefile
+++ b/libc/string/mips/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/mips/Makefile.arch b/libc/string/mips/Makefile.arch
deleted file mode 100644
index a110c291e..000000000
--- a/libc/string/mips/Makefile.arch
+++ /dev/null
@@ -1,26 +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.
-#
-
-SSRC:=memcpy.S memset.S
-
-STRING_ARCH_DIR:=$(top_srcdir)libc/string/mips
-STRING_ARCH_OUT:=$(top_builddir)libc/string/mips
-
-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/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/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/sparc/Makefile b/libc/string/sparc/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/sparc/Makefile
+++ b/libc/string/sparc/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/sparc/Makefile.arch b/libc/string/sparc/Makefile.arch
deleted file mode 100644
index 1acd93ad9..000000000
--- a/libc/string/sparc/Makefile.arch
+++ /dev/null
@@ -1,28 +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/sparc
-STRING_ARCH_OUT:=$(top_builddir)libc/string/sparc
-
-STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c)
-STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC))
-
-STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S)
-STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC))
-
-STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ)
-
-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_SRC)
-libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SOBJ)
-
-objclean-y+=string_arch_objclean
-
-string_arch_objclean:
-	$(RM) $(STRING_ARCH_OUT)/*.{o,os}
diff --git a/libc/string/x86_64/Makefile b/libc/string/x86_64/Makefile
index ac0063770..0a95346fd 100644
--- a/libc/string/x86_64/Makefile
+++ b/libc/string/x86_64/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/x86_64/Makefile.arch b/libc/string/x86_64/Makefile.arch
deleted file mode 100644
index 56e5a5165..000000000
--- a/libc/string/x86_64/Makefile.arch
+++ /dev/null
@@ -1,28 +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/x86_64
-STRING_ARCH_OUT:=$(top_builddir)libc/string/x86_64
-
-STRING_ARCH_SRC:=$(wildcard $(STRING_ARCH_DIR)/*.c)
-STRING_ARCH_OBJ:=$(patsubst $(STRING_ARCH_DIR)/%.c,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SRC))
-
-STRING_ARCH_SSRC:=$(wildcard $(STRING_ARCH_DIR)/*.S)
-STRING_ARCH_SOBJ:=$(patsubst $(STRING_ARCH_DIR)/%.S,$(STRING_ARCH_OUT)/%.o,$(STRING_ARCH_SSRC))
-
-STRING_ARCH_OBJS:=$(STRING_ARCH_OBJ) $(STRING_ARCH_SOBJ)
-
-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_SRC)
-libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SOBJ)
-
-objclean-y+=string_x86_64_objclean
-
-string_x86_64_objclean:
-	$(RM) $(STRING_ARCH_OUT)/*.{o,os}