From a29eb4f241edb90655a1a76efbaa2208a78ee5c4 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Wed, 15 Feb 2006 18:12:03 +0000
Subject: DOMULTI may be used for libc, the excluded files need work,
 linuxthreads[_db] as well, don't try on slow box

---
 Makerules                                  |  4 ++--
 libc/Makefile.in                           |  9 +++++----
 libc/inet/rpc/Makefile.in                  |  2 ++
 libc/misc/file/Makefile.in                 |  4 +++-
 libc/misc/internals/Makefile.in            |  2 ++
 libc/misc/pthread/Makefile.in              |  2 ++
 libc/misc/statfs/Makefile.in               |  4 +++-
 libc/stdio/Makefile.in                     | 12 ++++++++++--
 libc/stdlib/Makefile.in                    |  4 +++-
 libc/sysdeps/linux/common/Makefile.in      |  3 ++-
 libcrypt/Makefile.in                       |  2 +-
 libintl/Makefile.in                        |  4 ++--
 libm/Makefile.in                           |  4 ++--
 libpthread/linuxthreads.old/Makefile.in    | 10 +++++-----
 libpthread/linuxthreads.old_db/Makefile.in | 10 +++++-----
 libpthread/linuxthreads/Makefile.in        | 10 +++++-----
 libpthread/linuxthreads_db/Makefile.in     | 10 +++++-----
 libutil/Makefile.in                        |  2 +-
 18 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/Makerules b/Makerules
index 2ea5bcfa3..429b6aa7f 100644
--- a/Makerules
+++ b/Makerules
@@ -8,7 +8,7 @@
 ifeq ($(HAVE_SHARED),y)
 .LIBPATTERNS: "lib%.so"
 libs: $(lib-so-y) $(lib-a-y)
-$(lib-so-y): $(interp)
+$(lib-so-y): | $(interp)
 else
 .LIBPATTERNS: "lib%.a"
 libs: $(lib-a-y)
@@ -129,7 +129,7 @@ define linkm.so
 	$(Q)$(RM) $@ $@.$(2) $(dir $@)$(1)
 	@$(disp_ld)
 	$(Q)$(LD) $(LDFLAGS-$(notdir $@)) -soname=$(notdir $@).$(2) \
-		-o $(dir $@)$(1) $(START_FILE-$(notdir $@)) $(firstword $^) \
+		-o $(dir $@)$(1) $(START_FILE-$(notdir $@)) $^ \
 		$(LIBS-$(notdir $@)) $(LIBGCC) $(END_FILE-$(notdir $@))
 	$(Q)$(LN) -sf $(1) $@.$(2)
 	$(Q)$(LN) -sf $(1) $@
diff --git a/libc/Makefile.in b/libc/Makefile.in
index cf179c6e8..e9aa8a6ff 100644
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@@ -42,7 +42,7 @@ else
 libc-a-y = $(libc-y) $(libc-static-y)
 endif
 
-ifneq ($(DOMULTI),y)
+ifeq ($(DOMULTI),n)
 libc-so-y = $(libc-y:.o=.os) $(libc-shared-y)
 else
 all_sources = $(libc-y:.o=.c)
@@ -54,11 +54,12 @@ lib-a-y += $(top_builddir)lib/libc.a
 lib-so-y += $(libc)
 objclean-y += libc_clean
 
-ifneq ($(DOMULTI),y)
+ifeq ($(DOMULTI),n)
 $(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
 	$(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
 else
-$(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.os) $(LIBS-libc.so)
+$(libc:.$(MAJOR_VERSION)=): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so)
+	$(do_strip)
 	$(call linkm.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
 endif
 	$(Q)$(RM) $@
@@ -83,7 +84,7 @@ endif
 $(libc_OUT)/libc.oS: $(libc-multi-y) | $(top_builddir)lib/libc.a $(top_builddir)lib/$(NONSHARED_LIBNAME)
 	$(Q)$(RM) $@
 	$(compile-m)
-	$(do_t_strip)
+	#(do_t_strip)
 
 $(top_builddir)lib/libc.a: $(libc-a-y) | $(crt-y)
 	$(Q)$(INSTALL) -d $(dir $@)
diff --git a/libc/inet/rpc/Makefile.in b/libc/inet/rpc/Makefile.in
index e80b723b7..0fd12c3e3 100644
--- a/libc/inet/rpc/Makefile.in
+++ b/libc/inet/rpc/Makefile.in
@@ -34,6 +34,8 @@ INET_RPC_OBJ:=$(patsubst $(INET_RPC_DIR)/%.c,$(INET_RPC_OUT)/%.o,$(INET_RPC_SRC)
 libc-static-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.o
 libc-shared-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OUT)/rpc_thread.oS
 
+libc-nomulti-$(UCLIBC_HAS_RPC) += $(INET_RPC_OUT)/rpc_thread.o
+
 libc-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OBJ)
 
 objclean-y+=inet_rpc_objclean
diff --git a/libc/misc/file/Makefile.in b/libc/misc/file/Makefile.in
index b5f0ec4b3..bc3b2f124 100644
--- a/libc/misc/file/Makefile.in
+++ b/libc/misc/file/Makefile.in
@@ -17,7 +17,9 @@ MISC_FILE_OBJ := $(patsubst $(MISC_FILE_DIR)/%.c,$(MISC_FILE_OUT)/%.o,$(MISC_FIL
 
 libc-y += $(MISC_FILE_OBJ)
 
+libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_FILE_OUT)/lockf64.o
+
 objclean-y += misc_file_objclean
 
 misc_file_objclean:
-	$(RM) $(MISC_FILE_OUT)/*.{o,os}
+	$(RM) $(MISC_FILE_OUT)/*.{o,os,oS}
diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in
index 70712b834..ac5482a01 100644
--- a/libc/misc/internals/Makefile.in
+++ b/libc/misc/internals/Makefile.in
@@ -20,6 +20,8 @@ libc-y += $(MISC_INTERNALS_OBJ)
 libc-shared-y += $(MISC_INTERNALS_OUT)/__uClibc_main.oS
 libc-static-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o
 
+libc-nomulti-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o
+
 objclean-y += misc_internals_objclean
 
 misc_internals_objclean:
diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in
index b7821888d..3e0f5a780 100644
--- a/libc/misc/pthread/Makefile.in
+++ b/libc/misc/pthread/Makefile.in
@@ -11,6 +11,8 @@ MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread
 libc-static-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o
 libc-shared-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/no-tsd.oS
 
+libc-nomulti-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/no-tsd.o
+
 objclean-y += misc_pthread_objclean
 
 misc_pthread_objclean:
diff --git a/libc/misc/statfs/Makefile.in b/libc/misc/statfs/Makefile.in
index 7858c8351..c979b2255 100644
--- a/libc/misc/statfs/Makefile.in
+++ b/libc/misc/statfs/Makefile.in
@@ -18,7 +18,9 @@ MISC_STATFS_OBJ := $(patsubst %.c,$(MISC_STATFS_OUT)/%.o,$(CSRC))
 
 libc-y += $(MISC_STATFS_OBJ)
 
+libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_STATFS_OUT)/statvfs64.o $(MISC_STATFS_OUT)/fstatvfs64.o
+
 objclean-y += misc_statfs_objclean
 
 misc_statfs_objclean:
-	$(RM) $(MISC_STATFS_OUT)/*.{o,os}
+	$(RM) $(MISC_STATFS_OUT)/*.{o,os,oS}
diff --git a/libc/stdio/Makefile.in b/libc/stdio/Makefile.in
index 38bd8b6cf..5d4d74ed2 100644
--- a/libc/stdio/Makefile.in
+++ b/libc/stdio/Makefile.in
@@ -58,10 +58,11 @@ CUSRC := \
 
 # vfprintf and support functions
 ifneq ($(USE_OLD_VFPRINTF),y)
-CSRC += \
+VF_CSRC := \
 	vfprintf.c \
 	_ppfs_init.c _ppfs_prepargs.c _ppfs_setargs.c _ppfs_parsespec.c \
 	register_printf_function.c parse_printf_format.c
+CSRC += $(VF_CSRC)
 else
 CSRC += old_vfprintf.c
 endif
@@ -93,7 +94,14 @@ STDIO_OBJ := $(patsubst %.c,$(STDIO_OUT)/%.o,$(CSRC))
 
 libc-y += $(STDIO_OBJ)
 
+ifneq ($(USE_OLD_VFPRINTF),y)
+libc-nomulti-y += $(patsubst %.c,$(STDIO_OUT)/%.o,$(VF_CSRC))
+endif
+ifeq ($(UCLIBC_HAS_WCHAR),y)
+libc-nomulti-y += $(STDIO_OUT)/vfwprintf.o $(STDIO_OUT)/vfwscanf.o
+endif
+
 objclean-y += stdio_objclean
 
 stdio_objclean:
-	$(RM) $(STDIO_OUT)/*.{o,os}
+	$(RM) $(STDIO_OUT)/*.{o,os,oS}
diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in
index 5c3cd0d6b..e36bc947f 100644
--- a/libc/stdlib/Makefile.in
+++ b/libc/stdlib/Makefile.in
@@ -82,7 +82,9 @@ libc-static-y += $(STDLIB_OUT)/atexit.o
 # this should always be the PIC version, because it could be used in shared libs
 libc-nonshared-y += $(STDLIB_OUT)/atexit.os
 
+libc-nomulti-y += $(STDLIB_OUT)/labs.o $(STDLIB_OUT)/atol.o $(STDLIB_OUT)/_stdlib_strto_l.o $(STDLIB_OUT)/_stdlib_strto_ll.o
+
 objclean-y += stdlib_objclean
 
 stdlib_objclean:
-	$(RM) $(STDLIB_OUT)/*.{o,os}
+	$(RM) $(STDLIB_OUT)/*.{o,os,oS}
diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
index e1fda271c..54b36a7a1 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -39,9 +39,10 @@ libc-y += $(COMMON_OBJ)
 libc-static-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp-local.o
 libc-nonshared-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp-local.os
 
+libc-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o $(COMMON_OUT)/__syscall_sigaction.o
 libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o
 
 objclean-y += common_objclean
 
 common_objclean:
-	$(RM) $(COMMON_OUT)/*.{o,os}
+	$(RM) $(COMMON_OUT)/*.{o,os,oS}
diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
index b9c1ce921..0d84b6f10 100644
--- a/libcrypt/Makefile.in
+++ b/libcrypt/Makefile.in
@@ -39,7 +39,7 @@ $(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt_so.a $(libc)
 endif
 	$(call link.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION))
 else
-$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.oS $(libc)
+$(top_builddir)lib/libcrypt.so: $(libcrypt_OUT)/libcrypt.oS | $(libc)
 	$(call linkm.so,$(libcrypt_FULL_NAME),$(MAJOR_VERSION))
 endif
 
diff --git a/libintl/Makefile.in b/libintl/Makefile.in
index 96bfe33c4..624fa0df8 100644
--- a/libintl/Makefile.in
+++ b/libintl/Makefile.in
@@ -25,7 +25,7 @@ libintl_OUT := $(top_builddir)libintl
 libintl_MSRC := $(libintl_DIR)/intl.c
 libintl_MOBJ := $(patsubst %.o,$(libintl_OUT)/%.o,$(MOBJ))
 
-ifeq ($(DOMULTI),y)
+ifneq ($(DOMULTI),n)
 CFLAGS-libintl += $(patsubst %,-DL_%,$(subst .o,,$(notdir $(libintl_MOBJ))))
 endif
 
@@ -48,7 +48,7 @@ $(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl_so.a $(libc)
 endif
 	$(call link.so,$(libintl_FULL_NAME),$(MAJOR_VERSION))
 else
-$(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl.oS $(libc)
+$(top_builddir)lib/libintl.so: $(libintl_OUT)/libintl.oS | $(libc)
 	$(call linkm.so,$(libintl_FULL_NAME),$(MAJOR_VERSION))
 endif
 
diff --git a/libm/Makefile.in b/libm/Makefile.in
index be5bfc654..d10aafeb7 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -110,7 +110,7 @@ libm_OBJ := $(patsubst $(libm_DIR)/%.c,$(libm_OUT)/%.o,$(libm_SRC))
 libm_MSRC := $(libm_DIR)/$(FL_MSRC)
 libm_MOBJ := $(patsubst %.o,$(libm_OUT)/%.o,$(FL_MOBJ))
 
-ifeq ($(DOMULTI),y)
+ifneq ($(DOMULTI),n)
 CFLAGS-libm += $(patsubst %,-DL_%,$(subst .o,,$(notdir $(libm_MOBJ))))
 endif
 
@@ -135,7 +135,7 @@ $(top_builddir)lib/libm.so: $(libm_OUT)/libm_so.a $(libc)
 endif
 	$(call link.so,$(libm_FULL_NAME),$(MAJOR_VERSION))
 else
-$(top_builddir)lib/libm.so: $(libm_OUT)/libm.oS $(libc)
+$(top_builddir)lib/libm.so: $(libm_OUT)/libm.oS | $(libc)
 	$(call linkm.so,$(libm_FULL_NAME),$(MAJOR_VERSION))
 endif
 
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 7db2d8b88..1a2336ca0 100644
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -79,13 +79,13 @@ objclean-y += libpthread_clean
 headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
 headers_clean-y += linuxthreads_headers_clean
 
-ifeq ($(DOMULTI),n)
+#ifeq ($(DOMULTI),n)
 $(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
 	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
-else
-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS $(libc)
-	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
-endif
+#else
+#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc)
+#	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+#endif
 
 $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
 	$(Q)$(RM) $@
diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in
index dbc47b48c..0c5f7585a 100644
--- a/libpthread/linuxthreads.old_db/Makefile.in
+++ b/libpthread/linuxthreads.old_db/Makefile.in
@@ -34,17 +34,17 @@ objclean-y += libthread_db_clean
 headers-$(PTHREADS_DEBUG_SUPPORT) += linuxthreads_db_headers
 headers_clean-y += linuxthreads_db_headers_clean
 
-ifeq ($(DOMULTI),n)
+#ifeq ($(DOMULTI),n)
 ifeq ($(DOPIC),y)
 $(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc)
 else
 $(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc)
 endif
 	$(call link.so,$(libthread_db_FULL_NAME),1)
-else
-$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS $(libc)
-	$(call linkm.so,$(libthread_db_FULL_NAME),1)
-endif
+#else
+#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS | $(libc)
+#	$(call linkm.so,$(libthread_db_FULL_NAME),1)
+#endif
 
 $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
 	$(Q)$(RM) $@
diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in
index 2b6182dac..a03b3230d 100644
--- a/libpthread/linuxthreads/Makefile.in
+++ b/libpthread/linuxthreads/Makefile.in
@@ -82,13 +82,13 @@ objclean-y += libpthread_clean
 headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
 headers_clean-y += linuxthreads_headers_clean
 
-ifeq ($(DOMULTI),n)
+#ifeq ($(DOMULTI),n)
 $(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
 	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
-else
-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS $(libc)
-	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
-endif
+#else
+#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc)
+#	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+#endif
 
 $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
 	$(Q)$(RM) $@
diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in
index f85c6d24c..ec6afc016 100644
--- a/libpthread/linuxthreads_db/Makefile.in
+++ b/libpthread/linuxthreads_db/Makefile.in
@@ -34,17 +34,17 @@ objclean-y += libthread_db_clean
 headers-$(PTHREADS_DEBUG_SUPPORT) += linuxthreads_db_headers
 headers_clean-y += linuxthreads_db_headers_clean
 
-ifeq ($(DOMULTI),n)
+#ifeq ($(DOMULTI),n)
 ifeq ($(DOPIC),y)
 $(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc)
 else
 $(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc)
 endif
 	$(call link.so,$(libthread_db_FULL_NAME),1)
-else
-$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS $(libc)
-	$(call linkm.so,$(libthread_db_FULL_NAME),1)
-endif
+#else
+#$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db.oS | $(libc)
+#	$(call linkm.so,$(libthread_db_FULL_NAME),1)
+#endif
 
 $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
 	$(Q)$(RM) $@
diff --git a/libutil/Makefile.in b/libutil/Makefile.in
index cf3d72f05..20d103184 100644
--- a/libutil/Makefile.in
+++ b/libutil/Makefile.in
@@ -41,7 +41,7 @@ $(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil_so.a $(libc)
 endif
 	$(call link.so,$(libutil_FULL_NAME),$(MAJOR_VERSION))
 else
-$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil.oS $(libc)
+$(top_builddir)lib/libutil.so: $(libutil_OUT)/libutil.oS | $(libc)
 	$(call linkm.so,$(libutil_FULL_NAME),$(MAJOR_VERSION))
 endif
 
-- 
cgit v1.2.3