From c0b31e50087228fd0efd17b4703e1fc3099cb3b9 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Tue, 4 Oct 2005 15:25:39 +0000
Subject: Use PTDIR in libpthread/Makefile too, add new PTNAME being nptl or
 linuxthreads. sjhill, I know you kill my keyboard, but please read my added
 comments, thanks.

---
 Rules.mak | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'Rules.mak')

diff --git a/Rules.mak b/Rules.mak
index d3399b296..f70126e07 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -304,10 +304,17 @@ else
 endif
 
 ifeq ($(UCLIBC_HAS_THREADS),y)
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
+	PTNAME := nptl
+else
+	PTNAME := linuxthreads
+endif
+PTDIR := $(TOPDIR)libpthread/$(PTNAME)
 # set up system dependencies include dirs (NOTE: order matters!)
-PTDIR   := $(TOPDIR)libpthread/linuxthreads/
-PTINC   := -I$(PTDIR)sysdeps/pthread \
-           -I$(PTDIR)sysdeps/$(TARGET_ARCH)
+# psm: the next 2 are probably incorrect, the generic header will
+# win over the arch specific one
+PTINC := -I$(PTDIR)/sysdeps/pthread \
+	-I$(PTDIR)/sysdeps/$(TARGET_ARCH)
 endif
 
 ifeq ($(UCLIBC_BUILD_RELRO),y)
-- 
cgit v1.2.3