support O= for nptl too

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>

2 files changed, 23 insertions, 13 deletions

diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index 787107bc4..f882b3462 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -5,6 +5,10 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
+subdirs += libpthread/nptl/sysdeps/$(TARGET_ARCH)
+subdirs += libpthread/nptl/sysdeps/unix/sysv/linux
+subdirs += libpthread/nptl/sysdeps/pthread
+
 libpthread-routines = init vars events version \
 		      pthread_create pthread_exit pthread_detach \
 		      pthread_join pthread_tryjoin pthread_timedjoin \
@@ -299,26 +303,30 @@ $(PTHREAD_OUT)/pthread-errnos.h: $(PTHREAD_OUT)/pthread-errnos.s
 
 headers-$(UCLIBC_HAS_THREADS_NATIVE) += $(nptl_headers_bootstrap)
 
-include/pthread.h:
+$(top_builddir)include/pthread.h:
 	$(do_ln) ../$(PTDIR)/sysdeps/pthread/$(@F) $(top_builddir)$@
-include/semaphore.h:
+$(top_builddir)include/semaphore.h:
 	$(do_ln) ../$(PTDIR)/$(@F) $(top_builddir)$@
-include/bits/semaphore.h: | include/bits
+$(top_builddir)include/bits/semaphore.h: | include/bits
 	$(do_ln) ../../$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/$(@F) $(top_builddir)$@
-include/bits/pthreadtypes.h: | include/bits
+$(top_builddir)include/bits/pthreadtypes.h: | include/bits
 	$(do_ln) ../../$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/$(@F) $(top_builddir)$@
-include/bits/libc-lock.h: | include/bits
+$(top_builddir)include/bits/libc-lock.h: | include/bits
 	$(do_ln) ../../$(PTDIR)/sysdeps/pthread/bits/$(@F) $(top_builddir)$@
-include/bits/stdio-lock.h: | include/bits
+$(top_builddir)include/bits/stdio-lock.h: | include/bits
 	$(do_ln) ../../$(PTDIR)/sysdeps/pthread/bits/$(@F) $(top_builddir)$@
 
-nptl_headers_bootstrap:= include/pthread.h include/semaphore.h include/bits/semaphore.h include/bits/pthreadtypes.h \
-						include/bits/libc-lock.h include/bits/stdio-lock.h
+nptl_headers_bootstrap:= $(top_builddir)include/pthread.h \
+					     $(top_builddir)include/semaphore.h \
+						 $(top_builddir)include/bits/semaphore.h \
+						 $(top_builddir)include/bits/pthreadtypes.h \
+						 $(top_builddir)include/bits/libc-lock.h \
+						 $(top_builddir)include/bits/stdio-lock.h
 
 nptl_headers: $(PTHREAD_OUT)/pthread-errnos.h
 
 nptl_headers_clean:
-	$(do_rm) $(addprefix $(top_builddir),$(nptl_headers_bootstrap)) \
+	$(do_rm) $(nptl_headers_bootstrap) \
 	      $(addprefix $(PTHREAD_OUT)/pthread-errnos., c h s)
 
 libpthread_clean:
diff --git a/libpthread/nptl_db/Makefile.in b/libpthread/nptl_db/Makefile.in
index cec58b280..3eaded59f 100644
--- a/libpthread/nptl_db/Makefile.in
+++ b/libpthread/nptl_db/Makefile.in
@@ -5,6 +5,8 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
+subdirs += libpthread/nptl/nptl_db
+
 # Get the thread include dependencies and shared object name
 CFLAGS-nptl_db := -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\""
 CFLAGS-nptl_db += -I$(top_srcdir)libpthread/nptl -D_GNU_SOURCE
@@ -57,13 +59,13 @@ $(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
 	$(do_strip)
 	$(do_ar)
 
-include/thread_db.h:
-	$(do_ln) ../$(PTDIR)_db/$(@F) $(top_builddir)$@
+$(top_builddir)include/thread_db.h:
+	$(do_ln) $(call rel_srcdir)$(PTDIR)_db/$(@F) $@
 
-nptl_db_headers:= include/thread_db.h
+nptl_db_headers:= $(top_builddir)include/thread_db.h
 
 nptl_db_headers_clean:
-	$(do_rm) $(addprefix $(top_builddir),$(nptl_db_headers))
+	$(do_rm) $(nptl_db_headers)
 
 libthread_db_clean:
 	$(do_rm) $(addprefix $(libthread_db_OUT)/*., o oS a)