diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-17 02:07:34 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-17 02:07:34 +0000 |
| commit | 94a2a2040adfc4863ab2fb501cdbf4fb87849be2 (patch) | |
| tree | 39155622b8c9114bf41aa79b2918837e73a933cb /libc/stdio | |
| parent | f749efc0e5f1f8602c7e4f0c8c5b7d52ac18ab53 (diff) | |
| download | uClibc-alpine-94a2a2040adfc4863ab2fb501cdbf4fb87849be2.tar.bz2 uClibc-alpine-94a2a2040adfc4863ab2fb501cdbf4fb87849be2.tar.xz | |
Massive merge from trunk.
Diffstat (limited to 'libc/stdio')
| -rw-r--r-- | libc/stdio/Makefile.in | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/libc/stdio/Makefile.in b/libc/stdio/Makefile.in index 9a98afe8a..a928e0872 100644 --- a/libc/stdio/Makefile.in +++ b/libc/stdio/Makefile.in @@ -83,6 +83,14 @@ endif CSRC+=$(CUSRC) $(CWSRC) +ifneq ($(DOMULTI),n) +STDIO_CSRC_NO_MULTI:=fwrite.c fputc.c fputs.c fprintf.c _fpmaxtostr.c +CSRC:=$(filter-out $(STDIO_CSRC_NO_MULTI),$(CSRC)) +endif +STDIO_MOBJ1_NO_MULTI:=vfprintf.o vfwprintf.o register_printf_function.o +STDIO_MOBJ2_NO_MULTI:=vfscanf.o vfwscanf.o fscanf.o +STDIO_MOBJ_NO_MULTI:=$(STDIO_MOBJ1_NO_MULTI) $(STDIO_MOBJ2_NO_MULTI) + STDIO_DIR:=$(top_srcdir)libc/stdio STDIO_OUT:=$(top_builddir)libc/stdio @@ -101,20 +109,23 @@ STDIO_MOBJ2:=$(patsubst %.o,$(STDIO_OUT)/%.o,$(MOBJ2)) STDIO_MSRC:=$(STDIO_MSRC1) $(STDIO_MSRC2) STDIO_MOBJ:=$(STDIO_MOBJ1) $(STDIO_MOBJ2) -#STDIO_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STDIO_MOBJ)))) +STDIO_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(STDIO_MOBJ_NO_MULTI),$(notdir $(STDIO_MOBJ))))) STDIO_OBJS:=$(STDIO_OBJ) $(STDIO_MOBJ) $(STDIO_CUOBJ) $(STDIO_CLOBJ) -#STDIO_NO_MULTI:=$(STDIO_CUOBJ) $(STDIO_CLOBJ) +STDIO_NO_MULTI:=$(STDIO_CUOBJ) $(STDIO_CLOBJ) # these need special handling or rewrite to support multi-build # CUOBJ -%_unlocked.o %_unlocked.os: %.c +%_unlocked.o: %.c + $(compile.c) -D__DO_UNLOCKED + +%_unlocked.os: %.c $(compile.c) -D__DO_UNLOCKED # need this, else the other %64 files will get false rules $(STDIO_CLSRC): $(STDIO_OUT)/%64.c : $(STDIO_DIR)/%.c - cp $< $@ + @cp $< $@ $(STDIO_CLOBJ): %.o : %.c $(compile.c) -D__DO_LARGEFILE @@ -122,22 +133,28 @@ $(STDIO_CLOBJ): %.o : %.c $(STDIO_CLOBJ:.o=.os): %.os : %.c $(compile.c) -D__DO_LARGEFILE -$(STDIO_MOBJ1) $(STDIO_MOBJ1:.o=.os): $(STDIO_MSRC1) +$(STDIO_MOBJ1): $(STDIO_MSRC1) + $(compile.m) + +$(STDIO_MOBJ1:.o=.os): $(STDIO_MSRC1) + $(compile.m) + +$(STDIO_MOBJ2): $(STDIO_MSRC2) $(compile.m) -$(STDIO_MOBJ2) $(STDIO_MOBJ2:.o=.os): $(STDIO_MSRC2) +$(STDIO_MOBJ2:.o=.os): $(STDIO_MSRC2) $(compile.m) libc-a-y+=$(STDIO_OBJS) -libc-a-pic-y+=$(STDIO_OBJS:.o=.os) libc-so-y+=$(STDIO_OBJS:.o=.os) -#CFLAGS-multi-y+=$(STDIO_DEF) -#libc-multi-y+=$(STDIO_SRC) $(STDIO_MSRC) -#libc-nomulti-y+=$(STDIO_NO_MULTI) -libc-nomulti-y+=$(STDIO_OBJS) +CFLAGS-multi-y+=$(STDIO_DEF) +libc-multi-y+=$(STDIO_SRC) $(STDIO_MSRC) +libc-nomulti-y+=$(STDIO_NO_MULTI) +libc-nomulti-y+=$(patsubst %.c,$(STDIO_OUT)/%.o,$(STDIO_CSRC_NO_MULTI)) +libc-nomulti-y+=$(patsubst %.o,$(STDIO_OUT)/%.o,$(STDIO_MOBJ_NO_MULTI)) objclean-y+=stdio_objclean stdio_objclean: - $(RM) $(STDIO_OUT)/*.{o,os} + $(RM) $(STDIO_OUT)/*.{o,os} $(STDIO_OUT)/*64.c |