112 files changed, 31 insertions, 13 deletions
diff --git a/Rules.mak b/Rules.mak
index 7a0c48733..8389f74e5 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -334,8 +334,12 @@ ifeq ($(UCLIBC_HAS_THREADS),y)
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 	PTNAME := nptl
 else
+ifeq ($(LINUXTHREADS_OLD),y)
+	PTNAME := linuxthreads.old
+else
 	PTNAME := linuxthreads
 endif
+endif
 PTDIR := $(TOPDIR)libpthread/$(PTNAME)
 # set up system dependencies include dirs (NOTE: order matters!)
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 891820e7f..e15e9e7b6 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -326,6 +326,20 @@ config PTHREADS_DEBUG_SUPPORT
 	  If you are doing development and want to debug applications using
 	  uClibc's pthread library, answer Y.  Otherwise, answer N.
 
+config LINUXTHREADS_OLD
+	bool "Use the older (stable) version of linuxthreads"
+	default y
+	depends on UCLIBC_HAS_THREADS
+	help
+	  There are two versions of linuxthreads.  The older (stable) version
+	  has been in uClibc for quite a long time but hasn't seen too many
+	  updates other than bugfixes.
+
+	  The new version has not been tested much, and lacks ports for arches
+	  which glibc does not support (like bfin/frv/etc...), but is based on
+	  the latest code from glibc, so it may be the only choice for the
+	  newer ports (like alpha/amd64/64bit arches and hppa).
+
 config UCLIBC_HAS_LFS
 	bool "Large File Support"
 	default y
diff --git a/libpthread/linuxthreads/Changes b/libpthread/linuxthreads.old/Changes
index b213f36c5..b213f36c5 100644
--- a/libpthread/linuxthreads/Changes
+++ b/libpthread/linuxthreads.old/Changes
diff --git a/libpthread/linuxthreads/FAQ.html b/libpthread/linuxthreads.old/FAQ.html
index 21be33ec4..21be33ec4 100644
--- a/libpthread/linuxthreads/FAQ.html
+++ b/libpthread/linuxthreads.old/FAQ.html
diff --git a/libpthread/linuxthreads/LICENSE b/libpthread/linuxthreads.old/LICENSE
index 7bcca6050..7bcca6050 100644
--- a/libpthread/linuxthreads/LICENSE
+++ b/libpthread/linuxthreads.old/LICENSE
diff --git a/libpthread/linuxthreads/Makefile b/libpthread/linuxthreads.old/Makefile
index f92f205a5..f92f205a5 100644
--- a/libpthread/linuxthreads/Makefile
+++ b/libpthread/linuxthreads.old/Makefile
diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 4804a73c2..3aec4c562 100644
--- a/libpthread/linuxthreads/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -26,8 +26,8 @@ DOMULTI=n
 
 LIB_NAME:=libpthread
 
-libpthread_DIR:=$(top_srcdir)libpthread/linuxthreads
-libpthread_OUT:=$(top_builddir)libpthread/linuxthreads
+libpthread_DIR:=$(top_srcdir)libpthread/linuxthreads.old
+libpthread_OUT:=$(top_builddir)libpthread/linuxthreads.old
 
 ARCH_CFLAGS:=$(CFLAGS)
 -include $(libpthread_DIR)/sysdeps/$(TARGET_ARCH)/Makefile.arch
diff --git a/libpthread/linuxthreads/README b/libpthread/linuxthreads.old/README
index 955bd59e7..955bd59e7 100644
--- a/libpthread/linuxthreads/README
+++ b/libpthread/linuxthreads.old/README
diff --git a/libpthread/linuxthreads/attr.c b/libpthread/linuxthreads.old/attr.c
index 4432a04d1..4432a04d1 100644
--- a/libpthread/linuxthreads/attr.c
+++ b/libpthread/linuxthreads.old/attr.c
diff --git a/libpthread/linuxthreads/cancel.c b/libpthread/linuxthreads.old/cancel.c
index 1356348a7..1356348a7 100644
--- a/libpthread/linuxthreads/cancel.c
+++ b/libpthread/linuxthreads.old/cancel.c
diff --git a/libpthread/linuxthreads/condvar.c b/libpthread/linuxthreads.old/condvar.c
index f9c46a331..f9c46a331 100644
--- a/libpthread/linuxthreads/condvar.c
+++ b/libpthread/linuxthreads.old/condvar.c
diff --git a/libpthread/linuxthreads/debug.h b/libpthread/linuxthreads.old/debug.h
index a2ac5113a..a2ac5113a 100644
--- a/libpthread/linuxthreads/debug.h
+++ b/libpthread/linuxthreads.old/debug.h
diff --git a/libpthread/linuxthreads/errno.c b/libpthread/linuxthreads.old/errno.c
index f5778f98a..f5778f98a 100644
--- a/libpthread/linuxthreads/errno.c
+++ b/libpthread/linuxthreads.old/errno.c
diff --git a/libpthread/linuxthreads/events.c b/libpthread/linuxthreads.old/events.c
index a4bf1f898..a4bf1f898 100644
--- a/libpthread/linuxthreads/events.c
+++ b/libpthread/linuxthreads.old/events.c
diff --git a/libpthread/linuxthreads/internals.h b/libpthread/linuxthreads.old/internals.h
index 50a4d2d59..4b3396aee 100644
--- a/libpthread/linuxthreads/internals.h
+++ b/libpthread/linuxthreads.old/internals.h
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include "pt-machine.h"
 #include "semaphore.h"
-#include "../linuxthreads_db/thread_dbP.h"
+#include "../linuxthreads.old_db/thread_dbP.h"
 #ifdef __UCLIBC_HAS_XLOCALE__
 #include <bits/uClibc_locale.h>
 #endif /* __UCLIBC_HAS_XLOCALE__ */
diff --git a/libpthread/linuxthreads/join.c b/libpthread/linuxthreads.old/join.c
index 5aeec6a20..5aeec6a20 100644
--- a/libpthread/linuxthreads/join.c
+++ b/libpthread/linuxthreads.old/join.c
diff --git a/libpthread/linuxthreads/linuxthreads.texi b/libpthread/linuxthreads.old/linuxthreads.texi
index 795fb7097..795fb7097 100644
--- a/libpthread/linuxthreads/linuxthreads.texi
+++ b/libpthread/linuxthreads.old/linuxthreads.texi
diff --git a/libpthread/linuxthreads/locale.c b/libpthread/linuxthreads.old/locale.c
index c3ebbc285..c3ebbc285 100644
--- a/libpthread/linuxthreads/locale.c
+++ b/libpthread/linuxthreads.old/locale.c
diff --git a/libpthread/linuxthreads/lockfile.c b/libpthread/linuxthreads.old/lockfile.c
index b0f41c98a..b0f41c98a 100644
--- a/libpthread/linuxthreads/lockfile.c
+++ b/libpthread/linuxthreads.old/lockfile.c
diff --git a/libpthread/linuxthreads/manager.c b/libpthread/linuxthreads.old/manager.c
index 204344aef..204344aef 100644
--- a/libpthread/linuxthreads/manager.c
+++ b/libpthread/linuxthreads.old/manager.c
diff --git a/libpthread/linuxthreads/mutex.c b/libpthread/linuxthreads.old/mutex.c
index 7cc344fac..7cc344fac 100644
--- a/libpthread/linuxthreads/mutex.c
+++ b/libpthread/linuxthreads.old/mutex.c
diff --git a/libpthread/linuxthreads/oldsemaphore.c b/libpthread/linuxthreads.old/oldsemaphore.c
index 3a3b3d186..3a3b3d186 100644
--- a/libpthread/linuxthreads/oldsemaphore.c
+++ b/libpthread/linuxthreads.old/oldsemaphore.c
diff --git a/libpthread/linuxthreads/pt-machine.c b/libpthread/linuxthreads.old/pt-machine.c
index 438008d5d..438008d5d 100644
--- a/libpthread/linuxthreads/pt-machine.c
+++ b/libpthread/linuxthreads.old/pt-machine.c
diff --git a/libpthread/linuxthreads/ptfork.c b/libpthread/linuxthreads.old/ptfork.c
index eb544f34b..eb544f34b 100644
--- a/libpthread/linuxthreads/ptfork.c
+++ b/libpthread/linuxthreads.old/ptfork.c
diff --git a/libpthread/linuxthreads/pthread.c b/libpthread/linuxthreads.old/pthread.c
index fed3d8c72..fed3d8c72 100644
--- a/libpthread/linuxthreads/pthread.c
+++ b/libpthread/linuxthreads.old/pthread.c
diff --git a/libpthread/linuxthreads/pthread.c-OLDEXAMPLE b/libpthread/linuxthreads.old/pthread.c-OLDEXAMPLE
index 88b163087..88b163087 100644
--- a/libpthread/linuxthreads/pthread.c-OLDEXAMPLE
+++ b/libpthread/linuxthreads.old/pthread.c-OLDEXAMPLE
diff --git a/libpthread/linuxthreads/ptlongjmp.c b/libpthread/linuxthreads.old/ptlongjmp.c
index c0ea8223a..c0ea8223a 100644
--- a/libpthread/linuxthreads/ptlongjmp.c
+++ b/libpthread/linuxthreads.old/ptlongjmp.c
diff --git a/libpthread/linuxthreads/queue.h b/libpthread/linuxthreads.old/queue.h
index 28bd75531..28bd75531 100644
--- a/libpthread/linuxthreads/queue.h
+++ b/libpthread/linuxthreads.old/queue.h
diff --git a/libpthread/linuxthreads/restart.h b/libpthread/linuxthreads.old/restart.h
index 687d92fae..687d92fae 100644
--- a/libpthread/linuxthreads/restart.h
+++ b/libpthread/linuxthreads.old/restart.h
diff --git a/libpthread/linuxthreads/rwlock.c b/libpthread/linuxthreads.old/rwlock.c
index 977fd88af..977fd88af 100644
--- a/libpthread/linuxthreads/rwlock.c
+++ b/libpthread/linuxthreads.old/rwlock.c
diff --git a/libpthread/linuxthreads/semaphore.c b/libpthread/linuxthreads.old/semaphore.c
index 5be1f5316..5be1f5316 100644
--- a/libpthread/linuxthreads/semaphore.c
+++ b/libpthread/linuxthreads.old/semaphore.c
diff --git a/libpthread/linuxthreads/semaphore.h b/libpthread/linuxthreads.old/semaphore.h
index 7b09ea931..7b09ea931 100644
--- a/libpthread/linuxthreads/semaphore.h
+++ b/libpthread/linuxthreads.old/semaphore.h
diff --git a/libpthread/linuxthreads/signals.c b/libpthread/linuxthreads.old/signals.c
index df15b884e..df15b884e 100644
--- a/libpthread/linuxthreads/signals.c
+++ b/libpthread/linuxthreads.old/signals.c
diff --git a/libpthread/linuxthreads/specific.c b/libpthread/linuxthreads.old/specific.c
index d8b5bb0b3..d8b5bb0b3 100644
--- a/libpthread/linuxthreads/specific.c
+++ b/libpthread/linuxthreads.old/specific.c
diff --git a/libpthread/linuxthreads/spinlock.c b/libpthread/linuxthreads.old/spinlock.c
index cdf45f195..cdf45f195 100644
--- a/libpthread/linuxthreads/spinlock.c
+++ b/libpthread/linuxthreads.old/spinlock.c
diff --git a/libpthread/linuxthreads/spinlock.h b/libpthread/linuxthreads.old/spinlock.h
index 0ec40c57c..0ec40c57c 100644
--- a/libpthread/linuxthreads/spinlock.h
+++ b/libpthread/linuxthreads.old/spinlock.h
diff --git a/libpthread/linuxthreads/sysdeps/alpha/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/alpha/pt-machine.h
index 853ac6f04..853ac6f04 100644
--- a/libpthread/linuxthreads/sysdeps/alpha/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/alpha/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/arm/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h
index 284567970..284567970 100644
--- a/libpthread/linuxthreads/sysdeps/arm/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/arm/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/bfin/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
index fef16263e..fef16263e 100644
--- a/libpthread/linuxthreads/sysdeps/bfin/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/bfin/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/cris/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/cris/pt-machine.h
index 431da7101..431da7101 100644
--- a/libpthread/linuxthreads/sysdeps/cris/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/cris/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/frv/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
index 64df5ffdb..64df5ffdb 100644
--- a/libpthread/linuxthreads/sysdeps/frv/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/frv/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/i386/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/i386/pt-machine.h
index af1818d7b..af1818d7b 100644
--- a/libpthread/linuxthreads/sysdeps/i386/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/i386/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/i386/tls.h b/libpthread/linuxthreads.old/sysdeps/i386/tls.h
index e4f007ee3..e4f007ee3 100644
--- a/libpthread/linuxthreads/sysdeps/i386/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/i386/tls.h
diff --git a/libpthread/linuxthreads/sysdeps/i386/useldt.h b/libpthread/linuxthreads.old/sysdeps/i386/useldt.h
index 16aee9989..16aee9989 100644
--- a/libpthread/linuxthreads/sysdeps/i386/useldt.h
+++ b/libpthread/linuxthreads.old/sysdeps/i386/useldt.h
diff --git a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/m68k/pt-machine.h
index 4670ae3c4..4670ae3c4 100644
--- a/libpthread/linuxthreads/sysdeps/m68k/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/m68k/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/mips/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h
index f7efc881d..f7efc881d 100644
--- a/libpthread/linuxthreads/sysdeps/mips/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/mips/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/nios/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/nios/pt-machine.h
index 5d82b8d16..5d82b8d16 100644
--- a/libpthread/linuxthreads/sysdeps/nios/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/nios/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/nios2/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/nios2/pt-machine.h
index 484a77e14..484a77e14 100644
--- a/libpthread/linuxthreads/sysdeps/nios2/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/nios2/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/powerpc/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/powerpc/pt-machine.h
index 9e6543a26..9e6543a26 100644
--- a/libpthread/linuxthreads/sysdeps/powerpc/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/powerpc/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/pthread/bits/libc-lock.h b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
index e2b267d32..e2b267d32 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/bits/libc-lock.h
+++ b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-lock.h
diff --git a/libpthread/linuxthreads/sysdeps/pthread/bits/libc-tsd.h b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h
index efd0c83be..efd0c83be 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
+++ b/libpthread/linuxthreads.old/sysdeps/pthread/bits/libc-tsd.h
diff --git a/libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h b/libpthread/linuxthreads.old/sysdeps/pthread/bits/pthreadtypes.h
index faec63b06..faec63b06 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h
+++ b/libpthread/linuxthreads.old/sysdeps/pthread/bits/pthreadtypes.h
diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread.h b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h
index 6613cab88..6613cab88 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/pthread.h
+++ b/libpthread/linuxthreads.old/sysdeps/pthread/pthread.h
diff --git a/libpthread/linuxthreads/sysdeps/pthread/tls.h b/libpthread/linuxthreads.old/sysdeps/pthread/tls.h
index 6a23ec05e..6a23ec05e 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/pthread/tls.h
diff --git a/libpthread/linuxthreads/sysdeps/sh/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/sh/pt-machine.h
index 02545e6b4..02545e6b4 100644
--- a/libpthread/linuxthreads/sysdeps/sh/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/sh/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/sh/tls.h b/libpthread/linuxthreads.old/sysdeps/sh/tls.h
index 75326d8e1..75326d8e1 100644
--- a/libpthread/linuxthreads/sysdeps/sh/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/sh/tls.h
diff --git a/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch
index 38cd12db6..38cd12db6 100644
--- a/libpthread/linuxthreads/sysdeps/sh64/Makefile.arch
+++ b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch
diff --git a/libpthread/linuxthreads/sysdeps/sh64/pt-machine.c b/libpthread/linuxthreads.old/sysdeps/sh64/pt-machine.c
index ea4881322..ea4881322 100644
--- a/libpthread/linuxthreads/sysdeps/sh64/pt-machine.c
+++ b/libpthread/linuxthreads.old/sysdeps/sh64/pt-machine.c
diff --git a/libpthread/linuxthreads/sysdeps/sh64/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/sh64/pt-machine.h
index 8269a4cb3..8269a4cb3 100644
--- a/libpthread/linuxthreads/sysdeps/sh64/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/sh64/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/sparc/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/sparc/pt-machine.h
index ab90810f1..ab90810f1 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/sparc/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/sparc/sparc32/pt-machine.h
index 322a52051..322a52051 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/sparc32/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/sparc/sparc32/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/sparc/sparc64/pt-machine.h
index f65c13be1..f65c13be1 100644
--- a/libpthread/linuxthreads/sysdeps/sparc/sparc64/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/sparc/sparc64/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/v850/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h
index fb41c41e9..fb41c41e9 100644
--- a/libpthread/linuxthreads/sysdeps/v850/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/x86_64/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/x86_64/pt-machine.h
index 8a2d1a762..8a2d1a762 100644
--- a/libpthread/linuxthreads/sysdeps/x86_64/pt-machine.h
+++ b/libpthread/linuxthreads.old/sysdeps/x86_64/pt-machine.h
diff --git a/libpthread/linuxthreads/sysdeps/x86_64/tls.h b/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h
index d67275c10..d67275c10 100644
--- a/libpthread/linuxthreads/sysdeps/x86_64/tls.h
+++ b/libpthread/linuxthreads.old/sysdeps/x86_64/tls.h
diff --git a/libpthread/linuxthreads/wrapsyscall.c b/libpthread/linuxthreads.old/wrapsyscall.c
index 6b8a00bb5..6b8a00bb5 100644
--- a/libpthread/linuxthreads/wrapsyscall.c
+++ b/libpthread/linuxthreads.old/wrapsyscall.c
diff --git a/libpthread/linuxthreads_db/Banner b/libpthread/linuxthreads.old_db/Banner
index 6f4f3f818..6f4f3f818 100644
--- a/libpthread/linuxthreads_db/Banner
+++ b/libpthread/linuxthreads.old_db/Banner
diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads.old_db/Makefile
index f92f205a5..f92f205a5 100644
--- a/libpthread/linuxthreads_db/Makefile
+++ b/libpthread/linuxthreads.old_db/Makefile
diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in
index a066edd0e..0e29c7c18 100644
--- a/libpthread/linuxthreads_db/Makefile.in
+++ b/libpthread/linuxthreads.old_db/Makefile.in
@@ -25,8 +25,8 @@ libthread_db_FULL_NAME:=$(LIB_NAME)-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL
 
 MAJOR_VERSION:=1
 
-libthread_db_DIR:=$(top_srcdir)libpthread/linuxthreads_db
-libthread_db_OUT:=$(top_builddir)libpthread/linuxthreads_db
+libthread_db_DIR:=$(top_srcdir)libpthread/linuxthreads.old_db
+libthread_db_OUT:=$(top_builddir)libpthread/linuxthreads.old_db
 
 libthread_db_SRC:=$(wildcard $(libthread_db_DIR)/*.c)
 
diff --git a/libpthread/linuxthreads_db/Versions b/libpthread/linuxthreads.old_db/Versions
index 4ca8042c1..4ca8042c1 100644
--- a/libpthread/linuxthreads_db/Versions
+++ b/libpthread/linuxthreads.old_db/Versions
diff --git a/libpthread/linuxthreads_db/proc_service.h b/libpthread/linuxthreads.old_db/proc_service.h
index 74136c03e..74136c03e 100644
--- a/libpthread/linuxthreads_db/proc_service.h
+++ b/libpthread/linuxthreads.old_db/proc_service.h
diff --git a/libpthread/linuxthreads_db/td_init.c b/libpthread/linuxthreads.old_db/td_init.c
index d714f1ba0..d714f1ba0 100644
--- a/libpthread/linuxthreads_db/td_init.c
+++ b/libpthread/linuxthreads.old_db/td_init.c
diff --git a/libpthread/linuxthreads_db/td_log.c b/libpthread/linuxthreads.old_db/td_log.c
index 025273a63..025273a63 100644
--- a/libpthread/linuxthreads_db/td_log.c
+++ b/libpthread/linuxthreads.old_db/td_log.c
diff --git a/libpthread/linuxthreads_db/td_symbol_list.c b/libpthread/linuxthreads.old_db/td_symbol_list.c
index 779332b9d..779332b9d 100644
--- a/libpthread/linuxthreads_db/td_symbol_list.c
+++ b/libpthread/linuxthreads.old_db/td_symbol_list.c
diff --git a/libpthread/linuxthreads_db/td_ta_clear_event.c b/libpthread/linuxthreads.old_db/td_ta_clear_event.c
index bdbcf47aa..bdbcf47aa 100644
--- a/libpthread/linuxthreads_db/td_ta_clear_event.c
+++ b/libpthread/linuxthreads.old_db/td_ta_clear_event.c
diff --git a/libpthread/linuxthreads_db/td_ta_delete.c b/libpthread/linuxthreads.old_db/td_ta_delete.c
index 0e6ec17d0..0e6ec17d0 100644
--- a/libpthread/linuxthreads_db/td_ta_delete.c
+++ b/libpthread/linuxthreads.old_db/td_ta_delete.c
diff --git a/libpthread/linuxthreads_db/td_ta_enable_stats.c b/libpthread/linuxthreads.old_db/td_ta_enable_stats.c
index 1d4c34a8d..1d4c34a8d 100644
--- a/libpthread/linuxthreads_db/td_ta_enable_stats.c
+++ b/libpthread/linuxthreads.old_db/td_ta_enable_stats.c
diff --git a/libpthread/linuxthreads_db/td_ta_event_addr.c b/libpthread/linuxthreads.old_db/td_ta_event_addr.c
index 8bce35ae8..8bce35ae8 100644
--- a/libpthread/linuxthreads_db/td_ta_event_addr.c
+++ b/libpthread/linuxthreads.old_db/td_ta_event_addr.c
diff --git a/libpthread/linuxthreads_db/td_ta_event_getmsg.c b/libpthread/linuxthreads.old_db/td_ta_event_getmsg.c
index ec68ae0e2..c004a5b79 100644
--- a/libpthread/linuxthreads_db/td_ta_event_getmsg.c
+++ b/libpthread/linuxthreads.old_db/td_ta_event_getmsg.c
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "thread_dbP.h"
-#include "../linuxthreads/internals.h"
+#include "../linuxthreads.old/internals.h"
 
 
 td_err_e
diff --git a/libpthread/linuxthreads_db/td_ta_get_nthreads.c b/libpthread/linuxthreads.old_db/td_ta_get_nthreads.c
index 839b56be5..839b56be5 100644
--- a/libpthread/linuxthreads_db/td_ta_get_nthreads.c
+++ b/libpthread/linuxthreads.old_db/td_ta_get_nthreads.c
diff --git a/libpthread/linuxthreads_db/td_ta_get_ph.c b/libpthread/linuxthreads.old_db/td_ta_get_ph.c
index 23d328508..23d328508 100644
--- a/libpthread/linuxthreads_db/td_ta_get_ph.c
+++ b/libpthread/linuxthreads.old_db/td_ta_get_ph.c
diff --git a/libpthread/linuxthreads_db/td_ta_get_stats.c b/libpthread/linuxthreads.old_db/td_ta_get_stats.c
index 6bf2f5352..6bf2f5352 100644
--- a/libpthread/linuxthreads_db/td_ta_get_stats.c
+++ b/libpthread/linuxthreads.old_db/td_ta_get_stats.c
diff --git a/libpthread/linuxthreads_db/td_ta_map_id2thr.c b/libpthread/linuxthreads.old_db/td_ta_map_id2thr.c
index ddb6492e2..30f272af6 100644
--- a/libpthread/linuxthreads_db/td_ta_map_id2thr.c
+++ b/libpthread/linuxthreads.old_db/td_ta_map_id2thr.c
@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 #include "thread_dbP.h"
-#include "../linuxthreads/internals.h"
+#include "../linuxthreads.old/internals.h"
 
 
 td_err_e
diff --git a/libpthread/linuxthreads_db/td_ta_map_lwp2thr.c b/libpthread/linuxthreads.old_db/td_ta_map_lwp2thr.c
index 1337a5c68..5bdf970e4 100644
--- a/libpthread/linuxthreads_db/td_ta_map_lwp2thr.c
+++ b/libpthread/linuxthreads.old_db/td_ta_map_lwp2thr.c
@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 #include "thread_dbP.h"
-#include "../linuxthreads/internals.h"
+#include "../linuxthreads.old/internals.h"
 
 
 td_err_e
diff --git a/libpthread/linuxthreads_db/td_ta_new.c b/libpthread/linuxthreads.old_db/td_ta_new.c
index 9bf926719..9bf926719 100644
--- a/libpthread/linuxthreads_db/td_ta_new.c
+++ b/libpthread/linuxthreads.old_db/td_ta_new.c
diff --git a/libpthread/linuxthreads_db/td_ta_reset_stats.c b/libpthread/linuxthreads.old_db/td_ta_reset_stats.c
index b3ddbd07b..b3ddbd07b 100644
--- a/libpthread/linuxthreads_db/td_ta_reset_stats.c
+++ b/libpthread/linuxthreads.old_db/td_ta_reset_stats.c
diff --git a/libpthread/linuxthreads_db/td_ta_set_event.c b/libpthread/linuxthreads.old_db/td_ta_set_event.c
index 73cf9f405..73cf9f405 100644
--- a/libpthread/linuxthreads_db/td_ta_set_event.c
+++ b/libpthread/linuxthreads.old_db/td_ta_set_event.c
diff --git a/libpthread/linuxthreads_db/td_ta_setconcurrency.c b/libpthread/linuxthreads.old_db/td_ta_setconcurrency.c
index 408e76309..408e76309 100644
--- a/libpthread/linuxthreads_db/td_ta_setconcurrency.c
+++ b/libpthread/linuxthreads.old_db/td_ta_setconcurrency.c
diff --git a/libpthread/linuxthreads_db/td_ta_thr_iter.c b/libpthread/linuxthreads.old_db/td_ta_thr_iter.c
index 2dad149d5..6cc4bf7c1 100644
--- a/libpthread/linuxthreads_db/td_ta_thr_iter.c
+++ b/libpthread/linuxthreads.old_db/td_ta_thr_iter.c
@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 #include "thread_dbP.h"
-#include "../linuxthreads/internals.h"
+#include "../linuxthreads.old/internals.h"
 #include <alloca.h>
 
 static int
diff --git a/libpthread/linuxthreads_db/td_ta_tsd_iter.c b/libpthread/linuxthreads.old_db/td_ta_tsd_iter.c
index 9e24250c6..f15b45003 100644
--- a/libpthread/linuxthreads_db/td_ta_tsd_iter.c
+++ b/libpthread/linuxthreads.old_db/td_ta_tsd_iter.c
@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 #include "thread_dbP.h"
-#include "../linuxthreads/internals.h"
+#include "../linuxthreads.old/internals.h"
 #include <alloca.h>
 
 td_err_e
diff --git a/libpthread/linuxthreads_db/td_thr_clear_event.c b/libpthread/linuxthreads.old_db/td_thr_clear_event.c
index c027fc09f..c027fc09f 100644
--- a/libpthread/linuxthreads_db/td_thr_clear_event.c
+++ b/libpthread/linuxthreads.old_db/td_thr_clear_event.c
diff --git a/libpthread/linuxthreads_db/td_thr_dbresume.c b/libpthread/linuxthreads.old_db/td_thr_dbresume.c
index 7b7f6eef9..7b7f6eef9 100644
--- a/libpthread/linuxthreads_db/td_thr_dbresume.c
+++ b/libpthread/linuxthreads.old_db/td_thr_dbresume.c
diff --git a/libpthread/linuxthreads_db/td_thr_dbsuspend.c b/libpthread/linuxthreads.old_db/td_thr_dbsuspend.c
index ef668023d..ef668023d 100644
--- a/libpthread/linuxthreads_db/td_thr_dbsuspend.c
+++ b/libpthread/linuxthreads.old_db/td_thr_dbsuspend.c
diff --git a/libpthread/linuxthreads_db/td_thr_event_enable.c b/libpthread/linuxthreads.old_db/td_thr_event_enable.c
index 407f3fc44..407f3fc44 100644
--- a/libpthread/linuxthreads_db/td_thr_event_enable.c
+++ b/libpthread/linuxthreads.old_db/td_thr_event_enable.c
diff --git a/libpthread/linuxthreads_db/td_thr_event_getmsg.c b/libpthread/linuxthreads.old_db/td_thr_event_getmsg.c
index bf4ddd4ad..bf4ddd4ad 100644
--- a/libpthread/linuxthreads_db/td_thr_event_getmsg.c
+++ b/libpthread/linuxthreads.old_db/td_thr_event_getmsg.c
diff --git a/libpthread/linuxthreads_db/td_thr_get_info.c b/libpthread/linuxthreads.old_db/td_thr_get_info.c
index 4666bda97..4666bda97 100644
--- a/libpthread/linuxthreads_db/td_thr_get_info.c
+++ b/libpthread/linuxthreads.old_db/td_thr_get_info.c
diff --git a/libpthread/linuxthreads_db/td_thr_getfpregs.c b/libpthread/linuxthreads.old_db/td_thr_getfpregs.c
index 31c55c876..31c55c876 100644
--- a/libpthread/linuxthreads_db/td_thr_getfpregs.c
+++ b/libpthread/linuxthreads.old_db/td_thr_getfpregs.c
diff --git a/libpthread/linuxthreads_db/td_thr_getgregs.c b/libpthread/linuxthreads.old_db/td_thr_getgregs.c
index a9ec6a37d..a9ec6a37d 100644
--- a/libpthread/linuxthreads_db/td_thr_getgregs.c
+++ b/libpthread/linuxthreads.old_db/td_thr_getgregs.c
diff --git a/libpthread/linuxthreads_db/td_thr_getxregs.c b/libpthread/linuxthreads.old_db/td_thr_getxregs.c
index 39cd73cf1..39cd73cf1 100644
--- a/libpthread/linuxthreads_db/td_thr_getxregs.c
+++ b/libpthread/linuxthreads.old_db/td_thr_getxregs.c
diff --git a/libpthread/linuxthreads_db/td_thr_getxregsize.c b/libpthread/linuxthreads.old_db/td_thr_getxregsize.c
index 5d8ac288e..5d8ac288e 100644
--- a/libpthread/linuxthreads_db/td_thr_getxregsize.c
+++ b/libpthread/linuxthreads.old_db/td_thr_getxregsize.c
diff --git a/libpthread/linuxthreads_db/td_thr_set_event.c b/libpthread/linuxthreads.old_db/td_thr_set_event.c
index 205b445c7..205b445c7 100644
--- a/libpthread/linuxthreads_db/td_thr_set_event.c
+++ b/libpthread/linuxthreads.old_db/td_thr_set_event.c
diff --git a/libpthread/linuxthreads_db/td_thr_setfpregs.c b/libpthread/linuxthreads.old_db/td_thr_setfpregs.c
index e4d9ec65e..e4d9ec65e 100644
--- a/libpthread/linuxthreads_db/td_thr_setfpregs.c
+++ b/libpthread/linuxthreads.old_db/td_thr_setfpregs.c
diff --git a/libpthread/linuxthreads_db/td_thr_setgregs.c b/libpthread/linuxthreads.old_db/td_thr_setgregs.c
index 8c021a473..8c021a473 100644
--- a/libpthread/linuxthreads_db/td_thr_setgregs.c
+++ b/libpthread/linuxthreads.old_db/td_thr_setgregs.c
diff --git a/libpthread/linuxthreads_db/td_thr_setprio.c b/libpthread/linuxthreads.old_db/td_thr_setprio.c
index 98d202dfe..98d202dfe 100644
--- a/libpthread/linuxthreads_db/td_thr_setprio.c
+++ b/libpthread/linuxthreads.old_db/td_thr_setprio.c
diff --git a/libpthread/linuxthreads_db/td_thr_setsigpending.c b/libpthread/linuxthreads.old_db/td_thr_setsigpending.c
index 98e30140e..98e30140e 100644
--- a/libpthread/linuxthreads_db/td_thr_setsigpending.c
+++ b/libpthread/linuxthreads.old_db/td_thr_setsigpending.c
diff --git a/libpthread/linuxthreads_db/td_thr_setxregs.c b/libpthread/linuxthreads.old_db/td_thr_setxregs.c
index da77ab3b4..da77ab3b4 100644
--- a/libpthread/linuxthreads_db/td_thr_setxregs.c
+++ b/libpthread/linuxthreads.old_db/td_thr_setxregs.c
diff --git a/libpthread/linuxthreads_db/td_thr_sigsetmask.c b/libpthread/linuxthreads.old_db/td_thr_sigsetmask.c
index 8b0eb8185..8b0eb8185 100644
--- a/libpthread/linuxthreads_db/td_thr_sigsetmask.c
+++ b/libpthread/linuxthreads.old_db/td_thr_sigsetmask.c
diff --git a/libpthread/linuxthreads_db/td_thr_tls_get_addr.c b/libpthread/linuxthreads.old_db/td_thr_tls_get_addr.c
index e140b77dc..e140b77dc 100644
--- a/libpthread/linuxthreads_db/td_thr_tls_get_addr.c
+++ b/libpthread/linuxthreads.old_db/td_thr_tls_get_addr.c
diff --git a/libpthread/linuxthreads_db/td_thr_tsd.c b/libpthread/linuxthreads.old_db/td_thr_tsd.c
index f2cdefcfa..003ed95fe 100644
--- a/libpthread/linuxthreads_db/td_thr_tsd.c
+++ b/libpthread/linuxthreads.old_db/td_thr_tsd.c
@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 #include "thread_dbP.h"
-#include "../linuxthreads/internals.h"
+#include "../linuxthreads.old/internals.h"
 
 
 td_err_e
diff --git a/libpthread/linuxthreads_db/td_thr_validate.c b/libpthread/linuxthreads.old_db/td_thr_validate.c
index e18b5728b..31169ef60 100644
--- a/libpthread/linuxthreads_db/td_thr_validate.c
+++ b/libpthread/linuxthreads.old_db/td_thr_validate.c
@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 #include "thread_dbP.h"
-#include "../linuxthreads/internals.h"
+#include "../linuxthreads.old/internals.h"
 
 
 td_err_e
diff --git a/libpthread/linuxthreads_db/thread_db.h b/libpthread/linuxthreads.old_db/thread_db.h
index f0d9aa7c3..f0d9aa7c3 100644
--- a/libpthread/linuxthreads_db/thread_db.h
+++ b/libpthread/linuxthreads.old_db/thread_db.h
diff --git a/libpthread/linuxthreads_db/thread_dbP.h b/libpthread/linuxthreads.old_db/thread_dbP.h
index c45336ac9..a979a44a9 100644
--- a/libpthread/linuxthreads_db/thread_dbP.h
+++ b/libpthread/linuxthreads.old_db/thread_dbP.h
@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include "proc_service.h"
 #include "thread_db.h"
-#include "../linuxthreads/internals.h"
+#include "../linuxthreads.old/internals.h"
 
 
 /* Indeces for the symbol names.  */