There were two versions of 'pthreadtypes.h' originally in uClibc. Also,

since we are going to support the two implementations of pthreads, we
again need to instead create symbolic links to use the proper version
of the file depending on the pthreads option chosen.

1 files changed, 13 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 2519c3b95..92aa5962d 100644
--- a/Makefile
+++ b/Makefile
@@ -87,15 +87,6 @@ ifeq ($(strip $(ARCH_HAS_MMU)),y)
 else
 	@set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n
 endif
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
-	(cd include; \
-	$(LN) -fs ../libpthread/nptl/sysdeps/pthread/pthread.h .; \
-	$(LN) -fs ../libpthread/nptl/semaphore.h .);
-else
-	(cd include; \
-	$(LN) -fs ../libpthread/linuxthreads/sysdeps/pthread/pthread.h .; \
-	$(LN) -fs ../libpthread/linuxthreads/semaphore.h .);
-endif
 	@cd include/bits; \
 	set -e; \
 	for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \
@@ -126,6 +117,19 @@ endif
 	fi
 	$(MAKE) -C libc/sysdeps/linux/common headers
 	$(MAKE) -C libc/sysdeps/linux/$(TARGET_ARCH) headers
+ifeq ($(strip $(PTHREADS_NATIVE)),y)
+	(cd include; \
+	$(LN) -fs ../libpthread/nptl/sysdeps/pthread/pthread.h .; \
+	$(LN) -fs ../libpthread/nptl/semaphore.h .);
+	(cd include/bits; \
+	$(LN) -fs ../../libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/pthreadtypes.h .);
+else
+	(cd include; \
+	$(LN) -fs ../libpthread/linuxthreads/sysdeps/pthread/pthread.h .; \
+	$(LN) -fs ../libpthread/linuxthreads/semaphore.h .);
+	(cd include/bits; \
+	$(LN) -fs ../../libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h .);
+endif
 
 # Command used to download source code
 WGET:=wget --passive-ftp