svn commit: trunk/uClibc/libc/string: generic

[psm at uclibc.org]

Author: psm
Date: 2005-11-02 16:18:43 -0800 (Wed, 02 Nov 2005)
New Revision: 12124

Log:
Enable IMA on libc/string/generic

Modified:
   trunk/uClibc/libc/string/Makefile.in
   trunk/uClibc/libc/string/generic/Makefile.in


Changeset:
Modified: trunk/uClibc/libc/string/Makefile.in
===================================================================
--- trunk/uClibc/libc/string/Makefile.in	2005-11-02 23:55:41 UTC (rev 12123)
+++ trunk/uClibc/libc/string/Makefile.in	2005-11-03 00:18:43 UTC (rev 12124)
@@ -94,7 +94,7 @@
 libc-a-y+=$(STRING_OBJS)
 libc-so-y+=$(STRING_OBJS:.o=.os)
 
-# multi does not work here, because arch/Makefile.in uses the same L_* defines
+# multi does not work here, because arch/Makefile.arch uses the same L_* defines
 #CFLAGS-multi-y+=$(STRING_DEF)
 #libc-multi-y+=$(STRING_MSRC)
 #libc-nomulti-y+=$(STRING_Wx)

Modified: trunk/uClibc/libc/string/generic/Makefile.in
===================================================================
--- trunk/uClibc/libc/string/generic/Makefile.in	2005-11-02 23:55:41 UTC (rev 12123)
+++ trunk/uClibc/libc/string/generic/Makefile.in	2005-11-03 00:18:43 UTC (rev 12124)
@@ -9,23 +9,19 @@
 STRING_GENERIC_OUT:=$(top_builddir)libc/string/generic
 
 STRING_GENERIC_SRC:=$(wildcard $(STRING_GENERIC_DIR)/*.c)
-MOBJ:=$(patsubst $(STRING_GENERIC_DIR)/%.c,%.o,$(STRING_GENERIC_SRC))
 
 ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y)
 ifneq ($(strip $(STRING_ARCH_OBJS)),)
-MOBJ:=$(filter-out $(notdir $(STRING_ARCH_OBJS)),$(MOBJ))
+STRING_GENERIC_SRC:=$(filter-out $(patsubst %.o,$(STRING_GENERIC_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_GENERIC_SRC))
 endif
 endif
 
-STRING_GENERIC_OBJ:=$(patsubst %.o,$(STRING_GENERIC_OUT)/%.o,$(MOBJ))
+STRING_GENERIC_OBJS:=$(patsubst $(STRING_GENERIC_DIR)/%.c,$(STRING_GENERIC_OUT)/%.o,$(STRING_GENERIC_SRC))
 
-STRING_GENERIC_OBJS:=$(STRING_GENERIC_OBJ)
-
 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)
-libc-nomulti-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS)
+libc-multi-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_SRC)
 
 objclean-y+=string_generic_objclean