summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2005-10-04 15:25:39 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2005-10-04 15:25:39 +0000
commitc0b31e50087228fd0efd17b4703e1fc3099cb3b9 (patch)
treed096ea49ce7f35362aef00d1f330867f557980fc
parent75e3be2c706ebd829b5d544dd20b4a00ac4520ea (diff)
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.
-rw-r--r--Rules.mak13
-rw-r--r--libpthread/Makefile38
2 files changed, 23 insertions, 28 deletions
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)
diff --git a/libpthread/Makefile b/libpthread/Makefile
index a1cdcaedc..d3f3f2a48 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -19,40 +19,28 @@
TOPDIR=../
include $(TOPDIR)Rules.mak
-ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
-ALL_SUBDIRS = nptl nptl_db
-DIRS = nptl
+ALL_SUBDIRS = $(PTNAME) $(PTNAME)_db
+DIRS = $(PTNAME)
ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
- DIRS += nptl_db
-endif
-else
-ALL_SUBDIRS = linuxthreads linuxthreads_db
-DIRS = linuxthreads
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
- DIRS += linuxthreads_db
-endif
+ DIRS += $(PTNAME)_db
endif
all: subdirs
+# NPTL does not have a generic pthreadtypes.h ?
headers:
-ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
- $(LN) -sf $(TOPDIR)libpthread/nptl/sysdeps/pthread/pthread.h $(TOPDIR)include/
- $(LN) -sf $(TOPDIR)libpthread/nptl/semaphore.h $(TOPDIR)include/
- $(LN) -sf ../$(TOPDIR)libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/semaphore.h $(TOPDIR)include/bits/
- $(LN) -sf ../$(TOPDIR)libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/pthreadtypes.h $(TOPDIR)include/bits/
- $(LN) -sf ../$(TOPDIR)libpthread/nptl/sysdeps/pthread/bits/libc-lock.h $(TOPDIR)include/bits/
- $(LN) -sf ../$(TOPDIR)libpthread/nptl/sysdeps/pthread/bits/stdio-lock.h $(TOPDIR)include/bits/
+ $(LN) -sf $(PTDIR)/sysdeps/pthread/pthread.h $(TOPDIR)include/
+ $(LN) -sf $(PTDIR)/semaphore.h $(TOPDIR)include/
ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
- $(LN) -sf $(TOPDIR)libpthread/nptl_db/thread_db.h $(TOPDIR)include/
+ $(LN) -sf $(PTDIR)_db/thread_db.h $(TOPDIR)include/
endif
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
+ $(LN) -sf ../$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/semaphore.h $(TOPDIR)include/bits/
+ $(LN) -sf ../$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/pthreadtypes.h $(TOPDIR)include/bits/
+ $(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/libc-lock.h $(TOPDIR)include/bits/
+ $(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/stdio-lock.h $(TOPDIR)include/bits/
else
- $(LN) -sf $(TOPDIR)libpthread/linuxthreads/sysdeps/pthread/pthread.h $(TOPDIR)include/
- $(LN) -sf $(TOPDIR)libpthread/linuxthreads/semaphore.h $(TOPDIR)include/
- $(LN) -sf ../$(TOPDIR)libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h $(TOPDIR)include/bits/
-ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
- $(LN) -sf $(TOPDIR)libpthread/linuxthreads_db/thread_db.h $(TOPDIR)include/
-endif
+ $(LN) -sf ../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(TOPDIR)include/bits/
endif
tags: