From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 14 Feb 2015 23:00:19 -0600
Subject: resolve merge

---
 Rules.mak | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Rules.mak')

diff --git a/Rules.mak b/Rules.mak
index 2a73d7f0f..e7ec0f9e7 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -723,9 +723,7 @@ ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 	PTNAME := nptl
 	CFLAGS += -DHAVE_FORCED_UNWIND -D_LIBC_REENTRANT
 else
-ifeq ($(LINUXTHREADS_OLD),y)
-	PTNAME := linuxthreads.old
-else
+ifeq ($(UCLIBC_HAS_LINUXTHREADS),y)
 	PTNAME := linuxthreads
 endif
 endif
-- 
cgit v1.2.3