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/misc/ctype/Makefile.in | 1 - libc/misc/ftw/Makefile.in | 7 ++----- libc/misc/locale/Makefile.in | 5 ++++- libc/misc/time/Makefile.in | 7 ++----- 4 files changed, 8 insertions(+), 12 deletions(-) (limited to 'libc/misc') diff --git a/libc/misc/ctype/Makefile.in b/libc/misc/ctype/Makefile.in index 8b67514be..0999d8334 100644 --- a/libc/misc/ctype/Makefile.in +++ b/libc/misc/ctype/Makefile.in @@ -30,7 +30,6 @@ MISC_CTYPE_MSRC:=$(MISC_CTYPE_DIR)/$(MSRC) MISC_CTYPE_MOBJ:=$(patsubst %.o,$(MISC_CTYPE_OUT)/%.o,$(MOBJ)) MISC_CTYPE_MOBJx=$(patsubst %.o,$(MISC_CTYPE_OUT)/%.o,$(MOBJx)) -# adapt this if MOBJx is done for multi MISC_CTYPE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_CTYPE_MOBJ)))) $(MISC_CTYPE_MOBJ): $(MISC_CTYPE_MSRC) diff --git a/libc/misc/ftw/Makefile.in b/libc/misc/ftw/Makefile.in index 20b8b0e3b..c2cabfa0e 100644 --- a/libc/misc/ftw/Makefile.in +++ b/libc/misc/ftw/Makefile.in @@ -11,16 +11,13 @@ MOBJ:=ftw.o ftw64.o MISC_FTW_DIR:=$(top_srcdir)libc/misc/ftw MISC_FTW_OUT:=$(top_builddir)libc/misc/ftw -ifneq ($(DOMULTI),n) # ftw.c has to be rewritten to allow multi MISC_FTW_NO_MULTI:=ftw64.o -MOBJ:=$(filter-out $(MISC_FTW_NO_MULTI),$(MOBJ)) -endif MISC_FTW_MSRC:=$(MISC_FTW_DIR)/$(MSRC) MISC_FTW_MOBJ:=$(patsubst %.o,$(MISC_FTW_OUT)/%.o,$(MOBJ)) -MISC_FTW_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_FTW_MOBJ)))) +MISC_FTW_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_FTW_NO_MULTI),$(notdir $(MISC_FTW_MOBJ))))) MISC_FTW_OBJS:=$(MISC_FTW_MOBJ) @@ -35,7 +32,7 @@ libc-so-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_OBJS:.o=.os) CFLAGS-multi-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_DEF) libc-multi-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_MSRC) -libc-nomulti-$(UCLIBC_HAS_FTW)+=$(MISC_FTW_OUT)/$(MISC_FTW_NO_MULTI) +libc-nomulti-$(UCLIBC_HAS_FTW)+=$(patsubst %.o,$(MISC_FTW_OUT)/%.o,$(MISC_FTW_NO_MULTI)) objclean-y+=misc_ftw_objclean diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in index 2cdd70609..5f363ac65 100644 --- a/libc/misc/locale/Makefile.in +++ b/libc/misc/locale/Makefile.in @@ -23,6 +23,8 @@ ifeq ($(UCLIBC_HAS_LOCALE),y) DATA:=locale_data.o endif +MISC_LOCALE_NO_MULTI=localeconv.o + MISC_LOCALE_DIR:=$(top_srcdir)libc/misc/locale MISC_LOCALE_OUT:=$(top_builddir)libc/misc/locale @@ -31,7 +33,7 @@ MISC_LOCALE_MOBJ:=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJ)) MISC_LOCALE_MOBJx=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJx)) MISC_LOCALE_DATA=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(DATA)) -MISC_LOCALE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_LOCALE_MOBJ)))) +MISC_LOCALE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_LOCALE_NO_MULTI),$(notdir $(MISC_LOCALE_MOBJ))))) $(MISC_LOCALE_MOBJ): $(MISC_LOCALE_MSRC) $(compile.m) @@ -60,6 +62,7 @@ libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx:.o=.os) CFLAGS-multi-y+=$(MISC_LOCALE_DEF) libc-multi-y+=$(MISC_LOCALE_MSRC) +libc-nomulti-y+=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MISC_LOCALE_NO_MULTI)) libc-nomulti-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA) libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx) diff --git a/libc/misc/time/Makefile.in b/libc/misc/time/Makefile.in index 1588bed0e..64cbfe253 100644 --- a/libc/misc/time/Makefile.in +++ b/libc/misc/time/Makefile.in @@ -32,10 +32,7 @@ CSRC:=adjtime.c ftime.c MISC_TIME_DIR:=$(top_srcdir)libc/misc/time MISC_TIME_OUT:=$(top_builddir)libc/misc/time -ifndef ($(DOMULTI),n) -MISC_TIME_NO_MULTI:=strftime.o -MOBJ:=$(filter-out $(MISC_TIME_NO_MULTI),$(MOBJ)) -endif +MISC_TIME_NO_MULTI:=strftime.o mktime.o strptime.o gmtime.o localtime.o asctime.o asctime_r.o gmtime_r.o localtime_r.o MISC_TIME_SRC:=$(patsubst %.c,$(MISC_TIME_DIR)/%.c,$(CSRC)) MISC_TIME_OBJ:=$(patsubst %.c,$(MISC_TIME_OUT)/%.o,$(CSRC)) @@ -44,7 +41,7 @@ MISC_TIME_MSRC:=$(patsubst %.c,$(MISC_TIME_DIR)/%.c,$(MSRC)) MISC_TIME_MOBJ:=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJ)) MISC_TIME_MOBJx=$(patsubst %.o,$(MISC_TIME_OUT)/%.o,$(MOBJx)) -MISC_TIME_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_TIME_MOBJ)))) +MISC_TIME_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_TIME_NO_MULTI),$(notdir $(MISC_TIME_MOBJ))))) MISC_TIME_OBJS:=$(MISC_TIME_OBJ) $(MISC_TIME_MOBJ) -- cgit v1.2.3