Massive merge from trunk.

4 files changed, 34 insertions, 18 deletions

diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in
index 236d20cda..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,25 +89,40 @@ 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)
 
 STDLIB_OBJS:=$(STDLIB_OBJ) $(STDLIB_MOBJ) $(STDLIB_MOBJx)
 
-$(STDLIB_MOBJ1) $(STDLIB_MOBJ1:.o=.os): $(STDLIB_MSRC1)
+$(STDLIB_MOBJ1): $(STDLIB_MSRC1)
+	$(compile.m)
+
+$(STDLIB_MOBJ1:.o=.os): $(STDLIB_MSRC1)
 	$(compile.m)
 
-$(STDLIB_MOBJ2) $(STDLIB_MOBJ2:.o=.os): $(STDLIB_MSRC2)
+$(STDLIB_MOBJ2): $(STDLIB_MSRC2)
 	$(compile.m)
 
-$(STDLIB_MOBJ3) $(STDLIB_MOBJ3:.o=.os) $(STDLIB_OUT)/atexit.os: $(STDLIB_MSRC3)
+$(STDLIB_MOBJ2:.o=.os): $(STDLIB_MSRC2)
 	$(compile.m)
 
-$(STDLIB_MOBJ1x) $(STDLIB_MOBJ1x:.o=.os): $(STDLIB_MSRC1)
+$(STDLIB_MOBJ3): $(STDLIB_MSRC3)
+	$(compile.m)
+
+$(STDLIB_MOBJ3:.o=.os) $(STDLIB_OUT)/atexit.os: $(STDLIB_MSRC3)
+	$(compile.m)
+
+$(STDLIB_MOBJ1x): $(STDLIB_MSRC1)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(STDLIB_MOBJ1x:.o=.os): $(STDLIB_MSRC1)
+	$(compile.m) -D__UCLIBC_DO_XLOCALE
+
+$(STDLIB_MOBJ2x): $(STDLIB_MSRC2)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
-$(STDLIB_MOBJ2x) $(STDLIB_MOBJ2x:.o=.os): $(STDLIB_MSRC2)
+$(STDLIB_MOBJ2x:.o=.os): $(STDLIB_MSRC2)
 	$(compile.m) -D__UCLIBC_DO_XLOCALE
 
 libc-a-y+=$(STDLIB_OBJS)
@@ -112,12 +131,10 @@ libc-so-y+=$(STDLIB_OBJS:.o=.os)
 # this should always be the PIC version, because it could be used in shared libs
 libc-nonshared-y+=$(STDLIB_OUT)/atexit.os
 
-#CFLAGS-multi-y+=$(STDLIB_DEF)
-#libc-multi-y+=$(STDLIB_SRC) $(STDLIB_MSRC)
-#libc-nomulti-y+=$(STDLIB_MOBJx)
-#libc-multi-y+=$(STDLIB_MSRC)
-#libc-nomulti-y+=$(STDLIB_OBJ) $(STDLIB_MOBJx)
-libc-nomulti-y+=$(STDLIB_OBJS)
+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
 
diff --git a/libc/stdlib/malloc-simple/Makefile.in b/libc/stdlib/malloc-simple/Makefile.in
index 42b302071..7add9deaa 100644
--- a/libc/stdlib/malloc-simple/Makefile.in
+++ b/libc/stdlib/malloc-simple/Makefile.in
@@ -16,13 +16,15 @@ STDLIB_MALLOC_SIMPLE_MOBJ:=$(patsubst %.o,$(STDLIB_MALLOC_SIMPLE_OUT)/%.o,$(MOBJ
 STDLIB_MALLOC_SIMPLE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(STDLIB_MALLOC_SIMPLE_MOBJ))))
 
 libc-a-$(MALLOC_SIMPLE)+=$(STDLIB_MALLOC_SIMPLE_MOBJ)
-libc-a-pic-$(MALLOC_SIMPLE)+=$(STDLIB_MALLOC_SIMPLE_MOBJ:.o=.os)
 libc-so-$(MALLOC_SIMPLE)+=$(STDLIB_MALLOC_SIMPLE_MOBJ:.o=.os)
 
 CFLAGS-multi-$(MALLOC_SIMPLE)+=$(STDLIB_MALLOC_SIMPLE_DEF)
 libc-multi-$(MALLOC_SIMPLE)+=$(STDLIB_MALLOC_SIMPLE_MSRC)
 
-$(STDLIB_MALLOC_SIMPLE_MOBJ) $(STDLIB_MALLOC_SIMPLE_MOBJ:.o=.os): $(STDLIB_MALLOC_SIMPLE_MSRC)
+$(STDLIB_MALLOC_SIMPLE_MOBJ): $(STDLIB_MALLOC_SIMPLE_MSRC)
+	$(compile.m)
+
+$(STDLIB_MALLOC_SIMPLE_MOBJ:.o=.os): $(STDLIB_MALLOC_SIMPLE_MSRC)
 	$(compile.m)
 
 objclean-y+=stdlib_malloc_simple_objclean
diff --git a/libc/stdlib/malloc-standard/Makefile.in b/libc/stdlib/malloc-standard/Makefile.in
index e8c34b544..e566dad8c 100644
--- a/libc/stdlib/malloc-standard/Makefile.in
+++ b/libc/stdlib/malloc-standard/Makefile.in
@@ -22,7 +22,6 @@ STDLIB_MALLOC_STANDARD_SRC:=$(patsubst %.c,$(STDLIB_MALLOC_STANDARD_DIR)/%.c,$(C
 STDLIB_MALLOC_STANDARD_OBJ:=$(patsubst %.c,$(STDLIB_MALLOC_STANDARD_OUT)/%.o,$(CSRC))
 
 libc-a-$(MALLOC_STANDARD)+=$(STDLIB_MALLOC_STANDARD_OBJ)
-libc-a-pic-$(MALLOC_STANDARD)+=$(STDLIB_MALLOC_STANDARD_OBJ:.o=.os)
 libc-so-$(MALLOC_STANDARD)+=$(STDLIB_MALLOC_STANDARD_OBJ:.o=.os)
 
 libc-multi-$(MALLOC_STANDARD)+=$(STDLIB_MALLOC_STANDARD_SRC)
diff --git a/libc/stdlib/malloc/Makefile.in b/libc/stdlib/malloc/Makefile.in
index 6a0e3cee3..cf61011a4 100644
--- a/libc/stdlib/malloc/Makefile.in
+++ b/libc/stdlib/malloc/Makefile.in
@@ -26,11 +26,9 @@ STDLIB_MALLOC_SRC:=$(patsubst %.c,$(STDLIB_MALLOC_DIR)/%.c,$(CSRC))
 STDLIB_MALLOC_OBJ:=$(patsubst %.c,$(STDLIB_MALLOC_OUT)/%.o,$(CSRC))
 
 libc-a-$(MALLOC)+=$(STDLIB_MALLOC_OBJ)
-libc-a-pic-$(MALLOC)+=$(STDLIB_MALLOC_OBJ:.o=.os)
 libc-so-$(MALLOC)+=$(STDLIB_MALLOC_OBJ:.o=.os)
 
-#libc-multi-$(MALLOC)+=$(STDLIB_MALLOC_SRC)
-libc-nomulti-$(MALLOC)+=$(STDLIB_MALLOC_OBJ)
+libc-multi-$(MALLOC)+=$(STDLIB_MALLOC_SRC)
 
 objclean-y+=stdlib_malloc_objclean