[git commit nptl] improve parallel make behaviour

Austin Foxley austinf at cetoncorp.com
Wed Feb 10 14:24:03 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=7aab619f4b8d1331e34ec48384acf7db7d965218
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

 * add library dependencies for libdl,libpthread
 * fix typo in librt/Makefile.in
 * also remove extra trailing slashes on i386, sparc pregen headers

Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 Rules.mak                                   |    2 ++
 libpthread/nptl/Makefile.in                 |    2 +-
 libpthread/nptl/sysdeps/i386/Makefile.arch  |    4 ++--
 libpthread/nptl/sysdeps/sparc/Makefile.arch |    4 ++--
 librt/Makefile.in                           |    4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Rules.mak b/Rules.mak
index aaa8cb0..1b14780 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -127,6 +127,8 @@ UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION)
 NONSHARED_LIBNAME := uclibc_nonshared.a
 libc := $(top_builddir)lib/$(SHARED_MAJORNAME)
 libc.depend := $(top_builddir)lib/$(SHARED_MAJORNAME:.$(MAJOR_VERSION)=)
+libdl.depend := $(top_builddir)lib/libdl.so
+libpthread.depend := $(top_builddir)lib/libpthread.so
 interp := $(top_builddir)lib/interp.os
 ldso := $(top_builddir)lib/$(UCLIBC_LDSO)
 headers_dep := $(top_builddir)include/bits/sysnum.h
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index 253d36f..f530361 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -275,7 +275,7 @@ pregen-headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(nptl_headers) $(nptl_arch_heade
 lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
 lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
 
-$(top_builddir)lib/libpthread.so: $(PTHREAD_OUT)/libpthread_so.a $(libc) $(top_builddir)lib/libpthread_nonshared.a
+$(top_builddir)lib/libpthread.so: $(PTHREAD_OUT)/libpthread_so.a $(libc.depend) $(libdl.depend) $(top_builddir)lib/libpthread_nonshared.a
 	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
 	$(Q)$(RM) $@
 	$(Q)cp $(top_srcdir)extra/scripts/format.lds $@
diff --git a/libpthread/nptl/sysdeps/i386/Makefile.arch b/libpthread/nptl/sysdeps/i386/Makefile.arch
index 224e88c..1b5b988 100644
--- a/libpthread/nptl/sysdeps/i386/Makefile.arch
+++ b/libpthread/nptl/sysdeps/i386/Makefile.arch
@@ -13,8 +13,8 @@ CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE
 CFLAGS-i386 = $(SSP_ALL_CFLAGS)
 #CFLAGS:=$(CFLAGS:-O1=-O2)
 
-PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/i386/
-PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/i386/
+PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/i386
+PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/i386
 PTHREAD_ARCH_OBJ := $(patsubst %.S,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_SSRC))
 PTHREAD_ARCH_OBJ += $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_CSRC))
 
diff --git a/libpthread/nptl/sysdeps/sparc/Makefile.arch b/libpthread/nptl/sysdeps/sparc/Makefile.arch
index 27c98a6..ac6342c 100644
--- a/libpthread/nptl/sysdeps/sparc/Makefile.arch
+++ b/libpthread/nptl/sysdeps/sparc/Makefile.arch
@@ -13,8 +13,8 @@ CFLAGS-pthread_spin_lock.c += -D_GNU_SOURCE
 CFLAGS-sparc = $(SSP_ALL_CFLAGS)
 #CFLAGS:=$(CFLAGS:-O1=-O2)
 
-PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/sparc/
-PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/sparc/
+PTHREAD_ARCH_DIR := $(top_srcdir)libpthread/nptl/sysdeps/sparc
+PTHREAD_ARCH_OUT := $(top_builddir)libpthread/nptl/sysdeps/sparc
 PTHREAD_ARCH_OBJ := $(patsubst %.S,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_SSRC))
 PTHREAD_ARCH_OBJ += $(patsubst %.c,$(PTHREAD_ARCH_OUT)/%.o,$(libpthread_CSRC))
 
diff --git a/librt/Makefile.in b/librt/Makefile.in
index ea1d03e..88f4cbc 100644
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@@ -53,9 +53,9 @@ endif
 
 
 ifeq ($(DOPIC)$(UCLIBC_HAS_THREADS_NATIVE),yn)
-$(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(libc.dpend)
+$(top_builddir)lib/librt.so: $(top_builddir)lib/librt.a $(libc.depend)
 else
-$(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc.depend)
+$(top_builddir)lib/librt.so: $(librt_OUT)/librt_so.a $(libc.depend) $(libpthread.depend) $(libdl.depend)
 endif
 	$(call link.so,$(librt_FULL_NAME),$(MAJOR_VERSION))
 
-- 
1.6.3.3



More information about the uClibc-cvs mailing list