From 5565cde25062f5be8b8378d727e104922fec7801 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Mon, 7 Nov 2005 00:12:47 +0000 Subject: Disable multi build on asm files. i386/powerpc could be used if the source is splitted up --- libc/string/arm/Makefile.arch | 2 +- libc/string/frv/Makefile.arch | 2 +- libc/string/i386/Makefile.arch | 7 ++++--- libc/string/mips/Makefile.arch | 2 +- libc/string/powerpc/Makefile.arch | 7 ++++--- libc/string/sh64/Makefile.arch | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/libc/string/arm/Makefile.arch b/libc/string/arm/Makefile.arch index f4069d9d1..4b2550ee2 100644 --- a/libc/string/arm/Makefile.arch +++ b/libc/string/arm/Makefile.arch @@ -19,7 +19,7 @@ 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-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) +libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) objclean-y+=string_arch_objclean diff --git a/libc/string/frv/Makefile.arch b/libc/string/frv/Makefile.arch index 5b5230088..a864e8d1a 100644 --- a/libc/string/frv/Makefile.arch +++ b/libc/string/frv/Makefile.arch @@ -19,7 +19,7 @@ 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-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) +libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) objclean-y+=string_arch_objclean diff --git a/libc/string/i386/Makefile.arch b/libc/string/i386/Makefile.arch index 36f4ec26f..e12eb8170 100644 --- a/libc/string/i386/Makefile.arch +++ b/libc/string/i386/Makefile.arch @@ -18,7 +18,7 @@ STRING_ARCH_MOBJ:=$(patsubst %.o,$(STRING_ARCH_OUT)/%.o,$(MOBJ)) STRING_ARCH_OBJS:=$(STRING_ARCH_MOBJ) -STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_OBJS)))) +#STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_OBJS)))) $(STRING_ARCH_MOBJ): $(STRING_ARCH_MSRC) $(compile.m) @@ -29,8 +29,9 @@ $(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC) libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -CFLAGS-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_DEF) -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_MSRC) +#CFLAGS-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_DEF) +#libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_MSRC) +libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) objclean-y+=string_arch_objclean diff --git a/libc/string/mips/Makefile.arch b/libc/string/mips/Makefile.arch index 8aebbe27b..a110c291e 100644 --- a/libc/string/mips/Makefile.arch +++ b/libc/string/mips/Makefile.arch @@ -18,7 +18,7 @@ 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-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) +libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) objclean-y+=string_arch_objclean diff --git a/libc/string/powerpc/Makefile.arch b/libc/string/powerpc/Makefile.arch index 75fcfc67d..5d268093a 100644 --- a/libc/string/powerpc/Makefile.arch +++ b/libc/string/powerpc/Makefile.arch @@ -16,7 +16,7 @@ STRING_ARCH_MOBJ:=$(patsubst %.o,$(STRING_ARCH_OUT)/%.o,$(MOBJ)) STRING_ARCH_OBJS:=$(STRING_ARCH_MOBJ) -STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_MOBJ)))) +#STRING_ARCH_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STRING_ARCH_MOBJ)))) $(STRING_ARCH_MOBJ): $(STRING_ARCH_MSRC) $(compile.m) @@ -27,8 +27,9 @@ $(STRING_ARCH_MOBJ:.o=.os): $(STRING_ARCH_MSRC) libc-a-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) libc-so-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS:.o=.os) -CFLAGS-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_DEF) -libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_MSRC) +#CFLAGS-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_DEF) +#libc-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_MSRC) +libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) objclean-y+=string_arch_objclean diff --git a/libc/string/sh64/Makefile.arch b/libc/string/sh64/Makefile.arch index b691ae1d7..f246864f6 100644 --- a/libc/string/sh64/Makefile.arch +++ b/libc/string/sh64/Makefile.arch @@ -19,7 +19,7 @@ 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-multi-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_SRC) +libc-nomulti-$(UCLIBC_HAS_STRING_ARCH_OPT)+=$(STRING_ARCH_OBJS) objclean-y+=string_arch_objclean -- cgit v1.2.3