From ec2261ba97cc523230aed37979d81092e4b11f14 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Thu, 3 Nov 2005 21:23:07 +0000 Subject: Last bits for IMA, now everything can be built w/ DOMULTI=y on gcc-3.4.4 with my config (no locale, the rest enabled). Not tested if libc is complete and usable. All the files listed in *_NO_MULTI need love, best would be to replace all multisources w/ single sources. --- libc/stdlib/Makefile.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libc/stdlib') diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in index b81114de8..52527e1e5 100644 --- a/libc/stdlib/Makefile.in +++ b/libc/stdlib/Makefile.in @@ -67,6 +67,10 @@ ifeq ($(UCLIBC_HAS_FLOATS),y) CSRC+=drand48.c drand48_r.c erand48.c erand48_r.c endif +STDLIB_MOBJ1_NO_MULTI:=_stdlib_strto_l.o _stdlib_strto_ll.o +STDLIB_MOBJ2_NO_MULTI:=strtod.o strtof.o __strtofpmax.o +STDLIB_MOBJ_NO_MULTI:=$(STDLIB_MOBJ1_NO_MULTI) $(STDLIB_MOBJ2_NO_MULTI) + STDLIB_DIR:=$(top_srcdir)libc/stdlib STDLIB_OUT:=$(top_builddir)libc/stdlib @@ -85,7 +89,7 @@ STDLIB_MOBJ2x:=$(patsubst %.o,$(STDLIB_OUT)/%.o,$(MOBJ2x)) STDLIB_MSRC:=$(STDLIB_MSRC1) $(STDLIB_MSRC2) $(STDLIB_MSRC3) STDLIB_MOBJ:=$(STDLIB_MOBJ1) $(STDLIB_MOBJ2) $(STDLIB_MOBJ3) -STDLIB_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STDLIB_MOBJ)))) +STDLIB_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(STDLIB_MOBJ_NO_MULTI),$(notdir $(STDLIB_MOBJ))))) STDLIB_MOBJx:=$(STDLIB_MOBJ1x) $(STDLIB_MOBJ2x) @@ -129,6 +133,7 @@ libc-nonshared-y+=$(STDLIB_OUT)/atexit.os CFLAGS-multi-y+=$(STDLIB_DEF) libc-multi-y+=$(STDLIB_SRC) $(STDLIB_MSRC) +libc-nomulti-y+=$(patsubst %.o,$(STDLIB_OUT)/%.o,$(STDLIB_MOBJ_NO_MULTI)) libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(STDLIB_MOBJx) objclean-y+=stdlib_objclean -- cgit v1.2.3