From 602bd9701e5db47b68ae80feeb1a107483f2de5c Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 20 May 2005 19:13:42 +0000
Subject: Finish up reverting NPTL

---
 libpthread/Makefile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'libpthread')

diff --git a/libpthread/Makefile b/libpthread/Makefile
index abf9317d1..81979feb9 100644
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -32,11 +32,7 @@ LIBTHREAD_DB_SHARED_FULLNAME=libthread_db-$(MAJOR_VERSION).$(MINOR_VERSION).$(SU
 
 DIRS=
 ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
-	DIRS+=nptl
-else
 	DIRS+=linuxthreads
-endif
 	LDFLAGS_THREAD:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc -z defs
 ifeq ($(UCLIBC_BUILD_RELRO),y)
 	LDFLAGS_THREAD+=-z relro
@@ -45,11 +41,7 @@ ifeq ($(UCLIBC_BUILD_NOW),y)
 	LDFLAGS_THREAD+=-z now
 endif
 ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
-	DIRS+=nptl_db
-else
 	DIRS+=linuxthreads_db
-endif
 	LDFLAGS_THREAD_DB:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
 endif
 ifeq ($(DODEBUG),n)
@@ -68,7 +60,7 @@ ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
 	SHARED_END_FILES = $(LIBGCC_DIR)crtendS.o $(TOPDIR)lib/crtn.o
 endif
 
-ALL_SUBDIRS = linuxthreads linuxthreads_db nptl nptl_db
+ALL_SUBDIRS = linuxthreads linuxthreads_db
 
 all: $(LIBPTHREAD) $(LIBTHREAD_DB)
 
-- 
cgit v1.2.3