Selaa lähdekoodia

Disable multi build on asm files. i386/powerpc could be used if the source is splitted up

Peter S. Mazinger 18 vuotta sitten
vanhempi
commit
5565cde250

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 4 - 3
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
 

+ 1 - 1
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
 

+ 4 - 3
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
 

+ 1 - 1
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