124 files changed, 15956 insertions, 59 deletions

diff --git a/Makefile b/Makefile
index 0c6dd7a6e..877f47efb 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@
 TOPDIR=./
 include Rules.mak
 
-DIRS = extra ldso libc libcrypt libresolv libutil libm #libpthread
+DIRS = extra ldso libc libcrypt libresolv libutil libm libpthread
 
 all: headers uClibc_config.h subdirs shared finished
 
@@ -51,7 +51,7 @@ ifeq ($(strip $(HAVE_SHARED)),true)
 	@$(MAKE) -C libresolv shared
 	@$(MAKE) -C libutil shared
 	@$(MAKE) -C libm shared
-	#@$(MAKE) -C libpthread shared
+	@$(MAKE) -C libpthread shared
 else
 	@echo
 	@echo Not building shared libraries...
@@ -165,6 +165,11 @@ uClibc_config.h: Makefile Config
 	else \
 	    echo "#undef __UCLIBC_HAVE_LFS__" >> uClibc_config.h ; \
 	fi
+	@if [ "$(INCLUDE_THREADS)" = "true" ] ; then \
+	    echo "#define __UCLIBC_HAS_THREADS__ 1" >> uClibc_config.h ; \
+	else \
+	    echo "#undef __UCLIBC_HAS_THREADS__" >> uClibc_config.h ; \
+	fi
 	@if [ "$(UNIX98PTY_ONLY)" = "true" ] ; then \
 	    echo "#define UNIX98PTY_ONLY 1" >> uClibc_config.h ; \
 	else \
diff --git a/Rules.mak b/Rules.mak
index 92e0ef6e6..18d13b35a 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -105,7 +105,7 @@ ifeq ($(strip $(HAVE_SHARED)),true)
     ifeq ($(strip $(BUILD_UCLIBC_LDSO)),true)
     LDSO=$(TOPDIR)lib/$(UCLIBC_LDSO)
     DYNAMIC_LINKER=$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO)
-BUILD_DYNAMIC_LINKER=${shell cd $(TOPDIR)lib && pwd}/$(UCLIBC_LDSO)
+    BUILD_DYNAMIC_LINKER=${shell cd $(TOPDIR)lib && pwd}/$(UCLIBC_LDSO)
     else
     LDSO=$(SYSTEM_LDSO)
     BUILD_UCLIBC_LDSO=false