From a29eb4f241edb90655a1a76efbaa2208a78ee5c4 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" 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 --- 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 ++- 9 files changed, 32 insertions(+), 10 deletions(-) (limited to 'libc') 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} -- cgit v1.2.3