From 28b38f922241bd273f4f71823c037d4af43d96ba Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 17 Nov 2009 11:33:59 +0100
Subject: arch/ppc: commonalise the 32- and 64-bit PowerPC arch


diff --git a/config/arch/powerpc-powerpc64.in-common b/config/arch/powerpc-powerpc64.in-common
deleted file mode 100644
index 95f2859..0000000
--- a/config/arch/powerpc-powerpc64.in-common
+++ /dev/null
@@ -1,21 +0,0 @@
-# powerpc and powerpc64 common options
-
-if ARCH_powerpc || ARCH_powerpc64
-
-config ARCH_POWERPC_SPE
-    bool
-    prompt "Enable SPE support"
-    default n
-    help
-      Add support for the Signal Processing Engine.  This will set up
-      the toolchain so that it supports the SPE ABI extensions. This
-      mainly targets Freescale e500 processors.
-
-      Setting this option will append "spe" to the end of your target
-      tuple name (e.g., powerpc-e500v2-linux-gnuspe) so that the gcc
-      configure/build system will know to include SPE ABI support.
-      It will also automatically add "-mabi=spe -mspe" to your
-      TARGET_CFLAGS, and "--enable-e500_double" to your CC_EXTRA_CONFIG,
-      so you do not need to explicitly add them.
-
-endif # ARCH_powerpc || ARCH_powerpc64
diff --git a/config/arch/powerpc.in b/config/arch/powerpc.in
index 53a8c3b..90b1816 100644
--- a/config/arch/powerpc.in
+++ b/config/arch/powerpc.in
@@ -1,6 +1,9 @@
 # powerpc specific configuration file
 
 config ARCH_powerpc
+    select ARCH_SUPPORTS_32
+    select ARCH_SUPPORTS_64 if EXPERIMENTAL
+    select ARCH_DEFAULT_32
     select ARCH_USE_MMU
     select ARCH_SUPPORT_ABI
     select ARCH_SUPPORT_CPU
@@ -9,3 +12,18 @@ config ARCH_powerpc
       The PowerPC architecture, as defined by:
         http://www.ibm.com/developerworks/eserver/articles/archguide.html
 
+config ARCH_POWERPC_SPE
+    bool
+    prompt "Enable SPE support"
+    default n
+    help
+      Add support for the Signal Processing Engine.  This will set up
+      the toolchain so that it supports the SPE ABI extensions. This
+      mainly targets Freescale e500 processors.
+      
+      Setting this option will append "spe" to the end of your target
+      tuple name (e.g., powerpc-e500v2-linux-gnuspe) so that the gcc
+      configure/build system will know to include SPE ABI support.
+      It will also automatically add "-mabi=spe -mspe" to your
+      TARGET_CFLAGS, and "--enable-e500_double" to your CC_EXTRA_CONFIG,
+      so you do not need to explicitly add them.
diff --git a/config/arch/powerpc64.in b/config/arch/powerpc64.in
deleted file mode 100644
index c6d35e1..0000000
--- a/config/arch/powerpc64.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# powerpc specific configuration file
-# depends on EXPERIMENTAL
-
-config ARCH_powerpc64
-    select ARCH_USE_MMU
-    select ARCH_64
-    select ARCH_SUPPORT_ABI
-    select ARCH_SUPPORT_CPU
-    select ARCH_SUPPORT_TUNE
-    help
-      The PowerPC architecture, as defined by:
-        http://www.ibm.com/developerworks/eserver/articles/archguide.html
-
diff --git a/samples/powerpc-405-linux-gnu/crosstool.config b/samples/powerpc-405-linux-gnu/crosstool.config
index c83dde6..9a6ac77 100644
--- a/samples/powerpc-405-linux-gnu/crosstool.config
+++ b/samples/powerpc-405-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: hg_default@1596_241387704817
-# Wed Oct 28 23:16:25 2009
+# crosstool-NG version: hg_default@1634_192aef864818
+# Tue Nov 17 10:39:32 2009
 #
 
 #
@@ -49,6 +49,7 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_BUNDLED is not set
 # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
 # CT_PATCH_SINGLE is not set
 # CT_PATCH_USE_LOCAL is not set
@@ -88,6 +89,8 @@ CT_ARCH="powerpc"
 # CT_ARCH_64 is not set
 # CT_ARCH_SUPPORTS_BOTH_MMU is not set
 # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+CT_ARCH_SUPPORTS_32=y
+# CT_ARCH_SUPPORTS_64 is not set
 # CT_ARCH_SUPPORT_ARCH is not set
 CT_ARCH_SUPPORT_ABI=y
 CT_ARCH_SUPPORT_CPU=y
@@ -96,9 +99,13 @@ CT_ARCH_SUPPORT_TUNE=y
 # CT_ARCH_DEFAULT_HAS_MMU is not set
 # CT_ARCH_DEFAULT_BE is not set
 # CT_ARCH_DEFAULT_LE is not set
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ABI=""
 CT_ARCH_CPU="405"
 CT_ARCH_TUNE="405"
+CT_ARCH_32b=y
+# CT_ARCH_64b is not set
 # CT_ARCH_FLOAT_HW is not set
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
@@ -113,7 +120,8 @@ CT_TARGET_LDFLAGS=""
 # CT_ARCH_ia64 is not set
 # CT_ARCH_mips is not set
 CT_ARCH_powerpc=y
-# CT_ARCH_powerpc64 is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_s390x is not set
 # CT_ARCH_sh is not set
 # CT_ARCH_x86 is not set
 # CT_ARCH_x86_64 is not set
@@ -266,16 +274,18 @@ CT_CC_SUPPORT_OBJCXX=y
 CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
 CT_CC_LANG_JAVA=y
-CT_LIBC="glibc"
 
 #
 # C-library
 #
+CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
 # CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
 # CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
 # CT_LIBC_uClibc is not set
+# CT_LIBC_V_2_10_1 is not set
 CT_LIBC_V_2_9=y
 # CT_LIBC_V_2_8 is not set
 # CT_LIBC_V_2_7 is not set
@@ -314,13 +324,13 @@ CT_LIBC_ADDONS_LIST=""
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
 CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
 
 #
 # Common C library options
 #
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
 CT_THREADS_NPTL=y
 # CT_THREADS_LINUXTHREADS is not set
 # CT_THREADS_NONE is not set
diff --git a/samples/powerpc-860-linux-gnu/crosstool.config b/samples/powerpc-860-linux-gnu/crosstool.config
index fab679e..8314195 100644
--- a/samples/powerpc-860-linux-gnu/crosstool.config
+++ b/samples/powerpc-860-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: hg_default@1596_241387704817
-# Wed Oct 28 23:16:47 2009
+# crosstool-NG version: hg_default@1634_192aef864818
+# Tue Nov 17 11:22:40 2009
 #
 
 #
@@ -49,6 +49,7 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_BUNDLED is not set
 # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
 # CT_PATCH_SINGLE is not set
 # CT_PATCH_USE_LOCAL is not set
@@ -88,6 +89,8 @@ CT_ARCH="powerpc"
 # CT_ARCH_64 is not set
 # CT_ARCH_SUPPORTS_BOTH_MMU is not set
 # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+CT_ARCH_SUPPORTS_32=y
+# CT_ARCH_SUPPORTS_64 is not set
 # CT_ARCH_SUPPORT_ARCH is not set
 CT_ARCH_SUPPORT_ABI=y
 CT_ARCH_SUPPORT_CPU=y
@@ -96,9 +99,13 @@ CT_ARCH_SUPPORT_TUNE=y
 # CT_ARCH_DEFAULT_HAS_MMU is not set
 # CT_ARCH_DEFAULT_BE is not set
 # CT_ARCH_DEFAULT_LE is not set
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ABI=""
 CT_ARCH_CPU="860"
 CT_ARCH_TUNE=""
+CT_ARCH_32b=y
+# CT_ARCH_64b is not set
 # CT_ARCH_FLOAT_HW is not set
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
@@ -113,7 +120,8 @@ CT_TARGET_LDFLAGS=""
 # CT_ARCH_ia64 is not set
 # CT_ARCH_mips is not set
 CT_ARCH_powerpc=y
-# CT_ARCH_powerpc64 is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_s390x is not set
 # CT_ARCH_sh is not set
 # CT_ARCH_x86 is not set
 # CT_ARCH_x86_64 is not set
@@ -265,16 +273,18 @@ CT_CC_SUPPORT_OBJCXX=y
 CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
 # CT_CC_LANG_JAVA is not set
-CT_LIBC="glibc"
 
 #
 # C-library
 #
+CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
 # CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
 # CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
 # CT_LIBC_uClibc is not set
+# CT_LIBC_V_2_10_1 is not set
 CT_LIBC_V_2_9=y
 # CT_LIBC_V_2_8 is not set
 # CT_LIBC_V_2_7 is not set
@@ -313,13 +323,13 @@ CT_LIBC_ADDONS_LIST=""
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
 CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
 
 #
 # Common C library options
 #
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
 CT_THREADS_NPTL=y
 # CT_THREADS_LINUXTHREADS is not set
 # CT_THREADS_NONE is not set
diff --git a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
index 508238e..b495884 100644
--- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
+++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: hg_default@1596_241387704817
-# Wed Oct 28 23:17:14 2009
+# crosstool-NG version: hg_default@1634_192aef864818
+# Tue Nov 17 11:23:44 2009
 #
 
 #
@@ -50,6 +50,7 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_BUNDLED is not set
 # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
 # CT_PATCH_SINGLE is not set
 # CT_PATCH_USE_LOCAL is not set
@@ -89,6 +90,8 @@ CT_ARCH="powerpc"
 # CT_ARCH_64 is not set
 # CT_ARCH_SUPPORTS_BOTH_MMU is not set
 # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+CT_ARCH_SUPPORTS_32=y
+CT_ARCH_SUPPORTS_64=y
 # CT_ARCH_SUPPORT_ARCH is not set
 CT_ARCH_SUPPORT_ABI=y
 CT_ARCH_SUPPORT_CPU=y
@@ -97,9 +100,13 @@ CT_ARCH_SUPPORT_TUNE=y
 # CT_ARCH_DEFAULT_HAS_MMU is not set
 # CT_ARCH_DEFAULT_BE is not set
 # CT_ARCH_DEFAULT_LE is not set
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ABI=""
 CT_ARCH_CPU="8548"
 CT_ARCH_TUNE="8548"
+CT_ARCH_32b=y
+# CT_ARCH_64b is not set
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS="-mfloat-gprs=double -Wa,-me500x2"
@@ -114,7 +121,8 @@ CT_TARGET_LDFLAGS=""
 # CT_ARCH_ia64 is not set
 # CT_ARCH_mips is not set
 CT_ARCH_powerpc=y
-# CT_ARCH_powerpc64 is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_s390x is not set
 # CT_ARCH_sh is not set
 # CT_ARCH_x86 is not set
 # CT_ARCH_x86_64 is not set
@@ -269,15 +277,16 @@ CT_CC_LANG_JAVA=y
 # CT_CC_LANG_OBJC is not set
 # CT_CC_LANG_OBJCXX is not set
 CT_CC_LANG_OTHERS=""
-CT_LIBC="eglibc"
 
 #
 # C-library
 #
+CT_LIBC="eglibc"
 CT_LIBC_VERSION="2_9"
 CT_LIBC_eglibc=y
 # CT_LIBC_glibc is not set
 # CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
 # CT_LIBC_uClibc is not set
 # CT_LIBC_V_2_10 is not set
 CT_EGLIBC_V_2_9=y
@@ -303,13 +312,13 @@ CT_LIBC_ADDONS_LIST=""
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
 CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
 
 #
 # Common C library options
 #
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
 CT_THREADS_NPTL=y
 # CT_THREADS_LINUXTHREADS is not set
 # CT_THREADS_NONE is not set
diff --git a/samples/powerpc-unknown-linux-gnu/crosstool.config b/samples/powerpc-unknown-linux-gnu/crosstool.config
index dc2b6a2..b9139fa 100644
--- a/samples/powerpc-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: hg_default@1596_241387704817
-# Wed Oct 28 23:18:06 2009
+# crosstool-NG version: hg_default@1634_192aef864818
+# Tue Nov 17 11:29:28 2009
 #
 
 #
@@ -49,6 +49,7 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_BUNDLED is not set
 # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
 # CT_PATCH_SINGLE is not set
 # CT_PATCH_USE_LOCAL is not set
@@ -88,6 +89,8 @@ CT_ARCH="powerpc"
 # CT_ARCH_64 is not set
 # CT_ARCH_SUPPORTS_BOTH_MMU is not set
 # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+CT_ARCH_SUPPORTS_32=y
+# CT_ARCH_SUPPORTS_64 is not set
 # CT_ARCH_SUPPORT_ARCH is not set
 CT_ARCH_SUPPORT_ABI=y
 CT_ARCH_SUPPORT_CPU=y
@@ -96,9 +99,13 @@ CT_ARCH_SUPPORT_TUNE=y
 # CT_ARCH_DEFAULT_HAS_MMU is not set
 # CT_ARCH_DEFAULT_BE is not set
 # CT_ARCH_DEFAULT_LE is not set
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ABI=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
+CT_ARCH_32b=y
+# CT_ARCH_64b is not set
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
@@ -113,7 +120,8 @@ CT_TARGET_LDFLAGS=""
 # CT_ARCH_ia64 is not set
 # CT_ARCH_mips is not set
 CT_ARCH_powerpc=y
-# CT_ARCH_powerpc64 is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_s390x is not set
 # CT_ARCH_sh is not set
 # CT_ARCH_x86 is not set
 # CT_ARCH_x86_64 is not set
@@ -266,16 +274,18 @@ CT_CC_SUPPORT_OBJCXX=y
 CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
 CT_CC_LANG_JAVA=y
-CT_LIBC="glibc"
 
 #
 # C-library
 #
+CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
 # CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
 # CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
 # CT_LIBC_uClibc is not set
+# CT_LIBC_V_2_10_1 is not set
 CT_LIBC_V_2_9=y
 # CT_LIBC_V_2_8 is not set
 # CT_LIBC_V_2_7 is not set
@@ -301,13 +311,13 @@ CT_LIBC_ADDONS_LIST=""
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
 CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
 
 #
 # Common C library options
 #
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
 CT_THREADS_NPTL=y
 # CT_THREADS_LINUXTHREADS is not set
 # CT_THREADS_NONE is not set
diff --git a/samples/powerpc-unknown-linux-uclibc/crosstool.config b/samples/powerpc-unknown-linux-uclibc/crosstool.config
index 406ab62..ecaf6b8 100644
--- a/samples/powerpc-unknown-linux-uclibc/crosstool.config
+++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: hg_default@1596_241387704817
-# Wed Oct 28 23:18:19 2009
+# crosstool-NG version: hg_default@1634_192aef864818
+# Tue Nov 17 11:24:26 2009
 #
 
 #
@@ -49,6 +49,7 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_BUNDLED is not set
 # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
 # CT_PATCH_SINGLE is not set
 # CT_PATCH_USE_LOCAL is not set
@@ -88,6 +89,8 @@ CT_ARCH="powerpc"
 # CT_ARCH_64 is not set
 # CT_ARCH_SUPPORTS_BOTH_MMU is not set
 # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+CT_ARCH_SUPPORTS_32=y
+# CT_ARCH_SUPPORTS_64 is not set
 # CT_ARCH_SUPPORT_ARCH is not set
 CT_ARCH_SUPPORT_ABI=y
 CT_ARCH_SUPPORT_CPU=y
@@ -96,9 +99,13 @@ CT_ARCH_SUPPORT_TUNE=y
 # CT_ARCH_DEFAULT_HAS_MMU is not set
 # CT_ARCH_DEFAULT_BE is not set
 # CT_ARCH_DEFAULT_LE is not set
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ABI=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
+CT_ARCH_32b=y
+# CT_ARCH_64b is not set
 # CT_ARCH_FLOAT_HW is not set
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
@@ -113,7 +120,8 @@ CT_TARGET_LDFLAGS=""
 # CT_ARCH_ia64 is not set
 # CT_ARCH_mips is not set
 CT_ARCH_powerpc=y
-# CT_ARCH_powerpc64 is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_s390x is not set
 # CT_ARCH_sh is not set
 # CT_ARCH_x86 is not set
 # CT_ARCH_x86_64 is not set
@@ -263,15 +271,16 @@ CT_CC_SUPPORT_OBJCXX=y
 CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
 # CT_CC_LANG_JAVA is not set
-CT_LIBC="uClibc"
 
 #
 # C-library
 #
+CT_LIBC="uClibc"
 CT_LIBC_VERSION="0.9.30.1"
 # CT_LIBC_eglibc is not set
 # CT_LIBC_glibc is not set
 # CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
 CT_LIBC_uClibc=y
 CT_LIBC_V_0_9_30_1=y
 # CT_LIBC_V_0_9_30 is not set
@@ -291,13 +300,13 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL=0
 CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
 # CT_LIBC_UCLIBC_LOCALES is not set
+# CT_LIBC_SUPPORT_NPTL is not set
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="linuxthreads"
 
 #
 # Common C library options
 #
-# CT_LIBC_SUPPORT_NPTL is not set
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="linuxthreads"
 # CT_THREADS_NPTL is not set
 CT_THREADS_LINUXTHREADS=y
 # CT_THREADS_NONE is not set
diff --git a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
index 8c6635a..c1afeb4 100644
--- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
+++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: hg_default@1596_241387704817
-# Wed Oct 28 23:18:40 2009
+# crosstool-NG version: hg_default@1634_192aef864818
+# Tue Nov 17 11:24:42 2009
 #
 
 #
@@ -49,6 +49,7 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_BUNDLED is not set
 # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
 # CT_PATCH_SINGLE is not set
 # CT_PATCH_USE_LOCAL is not set
@@ -88,6 +89,8 @@ CT_ARCH="powerpc"
 # CT_ARCH_64 is not set
 # CT_ARCH_SUPPORTS_BOTH_MMU is not set
 # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+CT_ARCH_SUPPORTS_32=y
+# CT_ARCH_SUPPORTS_64 is not set
 # CT_ARCH_SUPPORT_ARCH is not set
 CT_ARCH_SUPPORT_ABI=y
 CT_ARCH_SUPPORT_CPU=y
@@ -96,9 +99,13 @@ CT_ARCH_SUPPORT_TUNE=y
 # CT_ARCH_DEFAULT_HAS_MMU is not set
 # CT_ARCH_DEFAULT_BE is not set
 # CT_ARCH_DEFAULT_LE is not set
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ABI=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
+CT_ARCH_32b=y
+# CT_ARCH_64b is not set
 # CT_ARCH_FLOAT_HW is not set
 CT_ARCH_FLOAT_SW=y
 CT_TARGET_CFLAGS=""
@@ -113,7 +120,8 @@ CT_TARGET_LDFLAGS=""
 # CT_ARCH_ia64 is not set
 # CT_ARCH_mips is not set
 CT_ARCH_powerpc=y
-# CT_ARCH_powerpc64 is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_s390x is not set
 # CT_ARCH_sh is not set
 # CT_ARCH_x86 is not set
 # CT_ARCH_x86_64 is not set
@@ -266,16 +274,18 @@ CT_CC_SUPPORT_OBJCXX=y
 CT_CC_LANG_CXX=y
 CT_CC_LANG_FORTRAN=y
 CT_CC_LANG_JAVA=y
-CT_LIBC="glibc"
 
 #
 # C-library
 #
+CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
 # CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
 # CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
 # CT_LIBC_uClibc is not set
+# CT_LIBC_V_2_10_1 is not set
 CT_LIBC_V_2_9=y
 # CT_LIBC_V_2_8 is not set
 # CT_LIBC_V_2_7 is not set
@@ -314,13 +324,13 @@ CT_LIBC_ADDONS_LIST=""
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
 CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
 
 #
 # Common C library options
 #
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
 CT_THREADS_NPTL=y
 # CT_THREADS_LINUXTHREADS is not set
 # CT_THREADS_NONE is not set
diff --git a/samples/powerpc64-unknown-linux-gnu/crosstool.config b/samples/powerpc64-unknown-linux-gnu/crosstool.config
index 7a22de4..611222d 100644
--- a/samples/powerpc64-unknown-linux-gnu/crosstool.config
+++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: hg_default@1596_241387704817
-# Wed Oct 28 23:19:09 2009
+# crosstool-NG version: hg_default@1634_192aef864818
+# Tue Nov 17 11:32:49 2009
 #
 
 #
@@ -50,6 +50,7 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_BUNDLED is not set
 # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
 # CT_PATCH_SINGLE is not set
 # CT_PATCH_USE_LOCAL is not set
@@ -85,10 +86,12 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="powerpc64"
+CT_ARCH="powerpc"
 CT_ARCH_64=y
 # CT_ARCH_SUPPORTS_BOTH_MMU is not set
 # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+CT_ARCH_SUPPORTS_32=y
+CT_ARCH_SUPPORTS_64=y
 # CT_ARCH_SUPPORT_ARCH is not set
 CT_ARCH_SUPPORT_ABI=y
 CT_ARCH_SUPPORT_CPU=y
@@ -97,9 +100,13 @@ CT_ARCH_SUPPORT_TUNE=y
 # CT_ARCH_DEFAULT_HAS_MMU is not set
 # CT_ARCH_DEFAULT_BE is not set
 # CT_ARCH_DEFAULT_LE is not set
+CT_ARCH_DEFAULT_32=y
+# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ABI=""
 CT_ARCH_CPU=""
 CT_ARCH_TUNE=""
+# CT_ARCH_32b is not set
+CT_ARCH_64b=y
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
@@ -113,8 +120,9 @@ CT_TARGET_LDFLAGS=""
 # CT_ARCH_avr32 is not set
 # CT_ARCH_ia64 is not set
 # CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-CT_ARCH_powerpc64=y
+CT_ARCH_powerpc=y
+# CT_ARCH_s390 is not set
+# CT_ARCH_s390x is not set
 # CT_ARCH_sh is not set
 # CT_ARCH_x86 is not set
 # CT_ARCH_x86_64 is not set
@@ -271,16 +279,18 @@ CT_CC_LANG_JAVA=y
 # CT_CC_LANG_OBJC is not set
 # CT_CC_LANG_OBJCXX is not set
 CT_CC_LANG_OTHERS=""
-CT_LIBC="glibc"
 
 #
 # C-library
 #
+CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
 # CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
 # CT_LIBC_newlib is not set
+# CT_LIBC_none is not set
 # CT_LIBC_uClibc is not set
+# CT_LIBC_V_2_10_1 is not set
 CT_LIBC_V_2_9=y
 # CT_LIBC_V_2_8 is not set
 # CT_LIBC_V_2_7 is not set
@@ -306,13 +316,13 @@ CT_LIBC_ADDONS_LIST=""
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
 CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
 
 #
 # Common C library options
 #
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
 CT_THREADS_NPTL=y
 # CT_THREADS_LINUXTHREADS is not set
 # CT_THREADS_NONE is not set
diff --git a/scripts/build/arch/powerpc-powerpc64.sh-common b/scripts/build/arch/powerpc-powerpc64.sh-common
deleted file mode 100644
index edba61e..0000000
--- a/scripts/build/arch/powerpc-powerpc64.sh-common
+++ /dev/null
@@ -1,22 +0,0 @@
-# Compute powerpc-specific values
-
-CT_DoArchTupleValues () {
-    # The architecture part of the tuple:
-    CT_TARGET_ARCH="${CT_ARCH}"
-
-    # The kernel ARCH:
-    CT_KERNEL_ARCH=powerpc
-
-    # Add spe in the tuplet if needed
-    case "${CT_LIBC},${CT_ARCH_POWERPC_SPE}" in
-        glibc,|eglibc,)   CT_TARGET_SYS=gnu;;
-        glibc,y|eglibc,y) CT_TARGET_SYS=gnuspe;;
-    esac
-
-    # Add extra flags for SPE if needed
-    if [ "${CT_ARCH_POWERPC_SPE}" = "y" ]; then
-        CT_ARCH_TARGET_CFLAGS="-mabi=spe -mspe"
-        CT_ARCH_CC_CORE_EXTRA_CONFIG="--enable-e500_double"
-        CT_ARCH_CC_EXTRA_CONFIG="--enable-e500_double"
-    fi
-}
diff --git a/scripts/build/arch/powerpc.sh b/scripts/build/arch/powerpc.sh
index 6bcd840..b55e2e0 100644
--- a/scripts/build/arch/powerpc.sh
+++ b/scripts/build/arch/powerpc.sh
@@ -1,3 +1,21 @@
 # Compute powerpc-specific values
 
-. "${CT_LIB_DIR}/scripts/build/arch/powerpc-powerpc64.sh-common"
+CT_DoArchTupleValues () {
+    # The architecture part of the tuple, override only for 64-bit
+    if [ "${CT_ARCH_64}" = "y" ]; then
+        CT_TARGET_ARCH="powerpc64"
+    fi
+
+    # Add spe in the tuple if needed
+    case "${CT_LIBC},${CT_ARCH_POWERPC_SPE}" in
+        glibc,|eglibc,)   CT_TARGET_SYS=gnu;;
+        glibc,y|eglibc,y) CT_TARGET_SYS=gnuspe;;
+    esac
+
+    # Add extra flags for SPE if needed
+    if [ "${CT_ARCH_POWERPC_SPE}" = "y" ]; then
+        CT_ARCH_TARGET_CFLAGS="-mabi=spe -mspe"
+        CT_ARCH_CC_CORE_EXTRA_CONFIG="--enable-e500_double"
+        CT_ARCH_CC_EXTRA_CONFIG="--enable-e500_double"
+    fi
+}
diff --git a/scripts/build/arch/powerpc64.sh b/scripts/build/arch/powerpc64.sh
deleted file mode 100644
index 6bcd840..0000000
--- a/scripts/build/arch/powerpc64.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Compute powerpc-specific values
-
-. "${CT_LIB_DIR}/scripts/build/arch/powerpc-powerpc64.sh-common"
-- 
cgit v0.10.2-6-g49f6