Merge the NPTL stuff.

That still leaves the linuxthreads stuff broken, but it was just before. I don't care anyway. Time to fix that later...

4 files changed, 47 insertions, 39 deletions

diff --git a/config/kernel_linux_headers_install.in b/config/kernel_linux_headers_install.in
index a2e1d7b0..072dd287 100644
--- a/config/kernel_linux_headers_install.in
+++ b/config/kernel_linux_headers_install.in
@@ -98,6 +98,16 @@ config KERNEL_INSTALL_V_2_6_21_1
     prompt "2.6.21.1"
     depends on KERNEL_VERSION_SEE_EXTRAVERSION
 
+config KERNEL_INSTALL_V_2_6_21_2
+    bool
+    prompt "2.6.21.2"
+    depends on KERNEL_VERSION_SEE_EXTRAVERSION
+
+config KERNEL_INSTALL_V_2_6_21_3
+    bool
+    prompt "2.6.21.3"
+    depends on KERNEL_VERSION_SEE_EXTRAVERSION
+
 # CT_INSERT_VERSION_ABOVE
 # Don't remove above line!
 endchoice
@@ -124,5 +134,7 @@ config KERNEL_VERSION
     default "2.6.20.7" if KERNEL_INSTALL_V_2_6_20_7
     default "2.6.21" if KERNEL_INSTALL_V_2_6_21
     default "2.6.21.1" if KERNEL_INSTALL_V_2_6_21_1
+    default "2.6.21.2" if KERNEL_INSTALL_V_2_6_21_2
+    default "2.6.21.3" if KERNEL_INSTALL_V_2_6_21_3
 # CT_INSERT_VERSION_STRING_ABOVE
 # Don't remove above line!
diff --git a/config/libc.in b/config/libc.in
index da86f1cb..e919ba85 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -36,31 +36,6 @@ config LIBC_SUPPORT_LINUXTHREADS
     bool
     default n
 
-choice
-    bool
-    prompt "Threading implentation to use:"
-    default LIBC_THREADS_NPTL           if LIBC_SUPPORT_NPTL
-    default LIBC_THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
-    default LIBC_THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
-    depends on EXPERIMENTAL
-
-config LIBC_THREADS_NPTL
-    bool
-    prompt "nptl (EXPERIMENTAL)"
-    depends on LIBC_SUPPORT_NPTL
-    depends on EXPERIMENTAL
-
-config LIBC_THREADS_LINUXTHREADS
-    bool
-    prompt "linuxthreads"
-    depends on LIBC_SUPPORT_LINUXTHREADS
-
-config LIBC_THREADS_NONE
-    bool
-    prompt "none"
-
-endchoice
-
 if LIBC_GLIBC
 source config/libc_glibc.in
 endif
diff --git a/config/libc_glibc.in b/config/libc_glibc.in
index d1b4be34..c0454d2b 100644
--- a/config/libc_glibc.in
+++ b/config/libc_glibc.in
@@ -181,7 +181,7 @@ config LIBC_GLIBC_CONFIGPARMS
 config LIBC_GLIBC_USE_PORTS
     bool
     prompt "Use the ports addon"
-    default y
+    default n
     help
       The ports addon contains some architecture ports that are not available
       in the official glibc distribution.
diff --git a/config/target.in b/config/target.in
index 5cad7827..1fcfc30c 100644
--- a/config/target.in
+++ b/config/target.in
@@ -19,53 +19,74 @@ choice
 config ARCH_ARM
     bool
     prompt "arm"
-    select ARCH_SUPPORTS_BE
-    select ARCH_SUPPORTS_LE
+    select ARCH_SUPPORTS_BOTH_ENDIAN
     select ARCH_SUPPORTS_LIBFLOAT
 
 config ARCH_MIPS
     bool
     prompt "mips"
-    select ARCH_SUPPORTS_BE
-    select ARCH_SUPPORTS_LE
+    select ARCH_SUPPORTS_BOTH_ENDIAN
 
 config ARCH_x86
     bool
     prompt "x86"
-    select ARCH_SUPPORTS_LE
     select ARCH_SUPPORTS_LIBFLOAT
 
 config ARCH_x86_64
     bool
     prompt "x86_64"
-    select ARCH_SUPPORTS_LE
 
 endchoice
 
-config ARCH_SUPPORTS_BE
-    bool
-    default n
-
-config ARCH_SUPPORTS_LE
+config ARCH_SUPPORTS_BOTH_ENDIAN
     bool
     default n
 
 choice
     bool
     prompt "Endianness:"
+    depends on ARCH_SUPPORTS_BOTH_ENDIAN
 
 config ARCH_BE
     bool
     prompt "Big endian"
-    depends on ARCH_SUPPORTS_BE
 
 config ARCH_LE
     bool
     prompt "Little endian"
-    depends on ARCH_SUPPORTS_LE
 
 endchoice
 
+choice
+    bool
+    prompt "Threading implentation to use:"
+    default THREADS_NPTL           if LIBC_SUPPORT_NPTL
+    default THREADS_LINUXTHREADS   if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
+    default THREADS_NONE           if ! LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL
+
+config THREADS_NPTL
+    bool
+    prompt "nptl (EXPERIMENTAL)"
+    depends on LIBC_SUPPORT_NPTL
+    depends on EXPERIMENTAL
+
+config THREADS_LINUXTHREADS
+    bool
+    prompt "linuxthreads"
+    depends on LIBC_SUPPORT_LINUXTHREADS
+
+config THREADS_NONE
+    bool
+    prompt "none"
+
+endchoice
+
+config THREADS
+    string
+    default "nptl"          if THREADS_NPTL
+    default "linuxthreads"  if THREADS_LINUXTHREADS
+    default "none"          if THREADS_NONE
+
 comment "Target optimisations"
 
 config ARCH_ARCH