From 1ba78f57e1f6435661a188beed05dd671ee7015f Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Fri, 29 Jul 2005 23:28:31 +0000
Subject: [PATCH] Add in options for NPTL in uClibc. Users can select, but
 since NPTL is on a branch it will not have any effect. Updated DBAu1500
 configuration files for latest uClibc snapshot and NPTL options.

---
 target/device/AMD/DBAu1500/uClibc.config.mips   | 8 +++++++-
 target/device/AMD/DBAu1500/uClibc.config.mipsel | 8 +++++++-
 toolchain/uClibc/Config.in                      | 5 +++++
 toolchain/uClibc/uclibc.mk                      | 3 +++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/target/device/AMD/DBAu1500/uClibc.config.mips b/target/device/AMD/DBAu1500/uClibc.config.mips
index 8c47ffcf0f..33db779f6f 100644
--- a/target/device/AMD/DBAu1500/uClibc.config.mips
+++ b/target/device/AMD/DBAu1500/uClibc.config.mips
@@ -17,6 +17,7 @@ TARGET_mips=y
 # TARGET_nios2 is not set
 # TARGET_powerpc is not set
 # TARGET_sh is not set
+# TARGET_sh64 is not set
 # TARGET_sparc is not set
 # TARGET_v850 is not set
 # TARGET_x86_64 is not set
@@ -42,7 +43,6 @@ ARCH_HAS_MMU=y
 UCLIBC_HAS_FLOATS=y
 HAS_FPU=y
 DO_C99_MATH=y
-WARNINGS="-Wall"
 KERNEL_SOURCE="/usr/src/linux"
 C_SYMBOL_PREFIX=""
 HAVE_DOT_CONFIG=y
@@ -61,9 +61,12 @@ LDSO_LDD_SUPPORT=y
 LDSO_CACHE_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_BASE_FILENAME="ld.so"
+LDSO_RUNPATH=y
+# DL_FINI_CRT_COMPAT is not set
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
+# PTHREADS_NATIVE is not set
 PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_LFS=y
 # UCLIBC_STATIC_LDCONFIG is not set
@@ -114,6 +117,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_4096=y
 UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
 # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
 # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
 UCLIBC_HAS_STDIO_GETC_MACRO=y
 UCLIBC_HAS_STDIO_PUTC_MACRO=y
 UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
@@ -152,7 +156,9 @@ DEVEL_PREFIX="/usr/"
 #
 CROSS_COMPILER_PREFIX=""
 # DODEBUG is not set
+# DODEBUG_PT is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
+WARNINGS="-Wall"
 # UCLIBC_MJN3_ONLY is not set
diff --git a/target/device/AMD/DBAu1500/uClibc.config.mipsel b/target/device/AMD/DBAu1500/uClibc.config.mipsel
index cd568e4272..74cba2141b 100644
--- a/target/device/AMD/DBAu1500/uClibc.config.mipsel
+++ b/target/device/AMD/DBAu1500/uClibc.config.mipsel
@@ -17,6 +17,7 @@ TARGET_mips=y
 # TARGET_nios2 is not set
 # TARGET_powerpc is not set
 # TARGET_sh is not set
+# TARGET_sh64 is not set
 # TARGET_sparc is not set
 # TARGET_v850 is not set
 # TARGET_x86_64 is not set
@@ -42,7 +43,6 @@ ARCH_HAS_MMU=y
 UCLIBC_HAS_FLOATS=y
 HAS_FPU=y
 DO_C99_MATH=y
-WARNINGS="-Wall"
 KERNEL_SOURCE="/usr/src/linux"
 C_SYMBOL_PREFIX=""
 HAVE_DOT_CONFIG=y
@@ -61,9 +61,12 @@ LDSO_LDD_SUPPORT=y
 LDSO_CACHE_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_BASE_FILENAME="ld.so"
+LDSO_RUNPATH=y
+# DL_FINI_CRT_COMPAT is not set
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
+# PTHREADS_NATIVE is not set
 PTHREADS_DEBUG_SUPPORT=y
 UCLIBC_HAS_LFS=y
 # UCLIBC_STATIC_LDCONFIG is not set
@@ -114,6 +117,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_4096=y
 UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
 # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
 # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
 UCLIBC_HAS_STDIO_GETC_MACRO=y
 UCLIBC_HAS_STDIO_PUTC_MACRO=y
 UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
@@ -152,7 +156,9 @@ DEVEL_PREFIX="/usr/"
 #
 CROSS_COMPILER_PREFIX=""
 # DODEBUG is not set
+# DODEBUG_PT is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
+WARNINGS="-Wall"
 # UCLIBC_MJN3_ONLY is not set
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index ce77ff76fc..a034b2e1f2 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -22,4 +22,9 @@ config BR2_ENABLE_LOCALE
 	help
 	    Enable locale/gettext/i18n support?
 
+config BR2_PTHREADS_NATIVE
+	bool "Enable Native POSIX Threading (NPTL) support?"
+	default n
+	help
+	    Enable Native POSIX Threading (NPTL) support?
 
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index db83e54e24..569a9e8b02 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -72,6 +72,9 @@ endif
 	$(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
 ifeq ($(BR2_SOFT_FLOAT),y)
 	$(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config
+endif
+ifeq ($(BR2_PTHREADS_NATIVE),y)
+	$(SED) 's,# PTHREADS_NATIVE is not set,PTHREADS_NATIVE=y,g' $(UCLIBC_DIR)/.config
 endif
 	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
 	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
-- 
2.30.2