arch/ppc: commonalise the 32- and 64-bit PowerPC arch
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Nov 17 11:33:59 2009 +0100 (2009-11-17)
changeset 1634186c71e3ceb0
parent 1633 95c28d483690
child 1635 5d1936ad5ba8
arch/ppc: commonalise the 32- and 64-bit PowerPC arch
config/arch/powerpc-powerpc64.in-common
config/arch/powerpc.in
config/arch/powerpc64.in
samples/powerpc-405-linux-gnu/crosstool.config
samples/powerpc-860-linux-gnu/crosstool.config
samples/powerpc-e500v2-linux-gnuspe/crosstool.config
samples/powerpc-unknown-linux-gnu/crosstool.config
samples/powerpc-unknown-linux-uclibc/crosstool.config
samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config
samples/powerpc64-unknown-linux-gnu/crosstool.config
scripts/build/arch/powerpc-powerpc64.sh-common
scripts/build/arch/powerpc.sh
scripts/build/arch/powerpc64.sh
     1.1 --- a/config/arch/powerpc-powerpc64.in-common	Tue Nov 17 09:27:38 2009 +0100
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,21 +0,0 @@
     1.4 -# powerpc and powerpc64 common options
     1.5 -
     1.6 -if ARCH_powerpc || ARCH_powerpc64
     1.7 -
     1.8 -config ARCH_POWERPC_SPE
     1.9 -    bool
    1.10 -    prompt "Enable SPE support"
    1.11 -    default n
    1.12 -    help
    1.13 -      Add support for the Signal Processing Engine.  This will set up
    1.14 -      the toolchain so that it supports the SPE ABI extensions. This
    1.15 -      mainly targets Freescale e500 processors.
    1.16 -
    1.17 -      Setting this option will append "spe" to the end of your target
    1.18 -      tuple name (e.g., powerpc-e500v2-linux-gnuspe) so that the gcc
    1.19 -      configure/build system will know to include SPE ABI support.
    1.20 -      It will also automatically add "-mabi=spe -mspe" to your
    1.21 -      TARGET_CFLAGS, and "--enable-e500_double" to your CC_EXTRA_CONFIG,
    1.22 -      so you do not need to explicitly add them.
    1.23 -
    1.24 -endif # ARCH_powerpc || ARCH_powerpc64
     2.1 --- a/config/arch/powerpc.in	Tue Nov 17 09:27:38 2009 +0100
     2.2 +++ b/config/arch/powerpc.in	Tue Nov 17 11:33:59 2009 +0100
     2.3 @@ -1,6 +1,9 @@
     2.4  # powerpc specific configuration file
     2.5  
     2.6  config ARCH_powerpc
     2.7 +    select ARCH_SUPPORTS_32
     2.8 +    select ARCH_SUPPORTS_64 if EXPERIMENTAL
     2.9 +    select ARCH_DEFAULT_32
    2.10      select ARCH_USE_MMU
    2.11      select ARCH_SUPPORT_ABI
    2.12      select ARCH_SUPPORT_CPU
    2.13 @@ -9,3 +12,18 @@
    2.14        The PowerPC architecture, as defined by:
    2.15          http://www.ibm.com/developerworks/eserver/articles/archguide.html
    2.16  
    2.17 +config ARCH_POWERPC_SPE
    2.18 +    bool
    2.19 +    prompt "Enable SPE support"
    2.20 +    default n
    2.21 +    help
    2.22 +      Add support for the Signal Processing Engine.  This will set up
    2.23 +      the toolchain so that it supports the SPE ABI extensions. This
    2.24 +      mainly targets Freescale e500 processors.
    2.25 +      
    2.26 +      Setting this option will append "spe" to the end of your target
    2.27 +      tuple name (e.g., powerpc-e500v2-linux-gnuspe) so that the gcc
    2.28 +      configure/build system will know to include SPE ABI support.
    2.29 +      It will also automatically add "-mabi=spe -mspe" to your
    2.30 +      TARGET_CFLAGS, and "--enable-e500_double" to your CC_EXTRA_CONFIG,
    2.31 +      so you do not need to explicitly add them.
     3.1 --- a/config/arch/powerpc64.in	Tue Nov 17 09:27:38 2009 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,13 +0,0 @@
     3.4 -# powerpc specific configuration file
     3.5 -# depends on EXPERIMENTAL
     3.6 -
     3.7 -config ARCH_powerpc64
     3.8 -    select ARCH_USE_MMU
     3.9 -    select ARCH_64
    3.10 -    select ARCH_SUPPORT_ABI
    3.11 -    select ARCH_SUPPORT_CPU
    3.12 -    select ARCH_SUPPORT_TUNE
    3.13 -    help
    3.14 -      The PowerPC architecture, as defined by:
    3.15 -        http://www.ibm.com/developerworks/eserver/articles/archguide.html
    3.16 -
     4.1 --- a/samples/powerpc-405-linux-gnu/crosstool.config	Tue Nov 17 09:27:38 2009 +0100
     4.2 +++ b/samples/powerpc-405-linux-gnu/crosstool.config	Tue Nov 17 11:33:59 2009 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  #
     4.5  # Automatically generated make config: don't edit
     4.6 -# crosstool-NG version: hg_default@1596_241387704817
     4.7 -# Wed Oct 28 23:16:25 2009
     4.8 +# crosstool-NG version: hg_default@1634_192aef864818
     4.9 +# Tue Nov 17 10:39:32 2009
    4.10  #
    4.11  
    4.12  #
    4.13 @@ -49,6 +49,7 @@
    4.14  # CT_PATCH_LOCAL_BUNDLED is not set
    4.15  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
    4.16  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
    4.17 +# CT_PATCH_NONE is not set
    4.18  CT_PATCH_ORDER="bundled"
    4.19  # CT_PATCH_SINGLE is not set
    4.20  # CT_PATCH_USE_LOCAL is not set
    4.21 @@ -88,6 +89,8 @@
    4.22  # CT_ARCH_64 is not set
    4.23  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
    4.24  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
    4.25 +CT_ARCH_SUPPORTS_32=y
    4.26 +# CT_ARCH_SUPPORTS_64 is not set
    4.27  # CT_ARCH_SUPPORT_ARCH is not set
    4.28  CT_ARCH_SUPPORT_ABI=y
    4.29  CT_ARCH_SUPPORT_CPU=y
    4.30 @@ -96,9 +99,13 @@
    4.31  # CT_ARCH_DEFAULT_HAS_MMU is not set
    4.32  # CT_ARCH_DEFAULT_BE is not set
    4.33  # CT_ARCH_DEFAULT_LE is not set
    4.34 +CT_ARCH_DEFAULT_32=y
    4.35 +# CT_ARCH_DEFAULT_64 is not set
    4.36  CT_ARCH_ABI=""
    4.37  CT_ARCH_CPU="405"
    4.38  CT_ARCH_TUNE="405"
    4.39 +CT_ARCH_32b=y
    4.40 +# CT_ARCH_64b is not set
    4.41  # CT_ARCH_FLOAT_HW is not set
    4.42  CT_ARCH_FLOAT_SW=y
    4.43  CT_TARGET_CFLAGS=""
    4.44 @@ -113,7 +120,8 @@
    4.45  # CT_ARCH_ia64 is not set
    4.46  # CT_ARCH_mips is not set
    4.47  CT_ARCH_powerpc=y
    4.48 -# CT_ARCH_powerpc64 is not set
    4.49 +# CT_ARCH_s390 is not set
    4.50 +# CT_ARCH_s390x is not set
    4.51  # CT_ARCH_sh is not set
    4.52  # CT_ARCH_x86 is not set
    4.53  # CT_ARCH_x86_64 is not set
    4.54 @@ -266,16 +274,18 @@
    4.55  CT_CC_LANG_CXX=y
    4.56  CT_CC_LANG_FORTRAN=y
    4.57  CT_CC_LANG_JAVA=y
    4.58 -CT_LIBC="glibc"
    4.59  
    4.60  #
    4.61  # C-library
    4.62  #
    4.63 +CT_LIBC="glibc"
    4.64  CT_LIBC_VERSION="2.9"
    4.65  # CT_LIBC_eglibc is not set
    4.66  CT_LIBC_glibc=y
    4.67  # CT_LIBC_newlib is not set
    4.68 +# CT_LIBC_none is not set
    4.69  # CT_LIBC_uClibc is not set
    4.70 +# CT_LIBC_V_2_10_1 is not set
    4.71  CT_LIBC_V_2_9=y
    4.72  # CT_LIBC_V_2_8 is not set
    4.73  # CT_LIBC_V_2_7 is not set
    4.74 @@ -314,13 +324,13 @@
    4.75  CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
    4.76  # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
    4.77  CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
    4.78 +CT_LIBC_SUPPORT_NPTL=y
    4.79 +CT_LIBC_SUPPORT_LINUXTHREADS=y
    4.80 +CT_THREADS="nptl"
    4.81  
    4.82  #
    4.83  # Common C library options
    4.84  #
    4.85 -CT_LIBC_SUPPORT_NPTL=y
    4.86 -CT_LIBC_SUPPORT_LINUXTHREADS=y
    4.87 -CT_THREADS="nptl"
    4.88  CT_THREADS_NPTL=y
    4.89  # CT_THREADS_LINUXTHREADS is not set
    4.90  # CT_THREADS_NONE is not set
     5.1 --- a/samples/powerpc-860-linux-gnu/crosstool.config	Tue Nov 17 09:27:38 2009 +0100
     5.2 +++ b/samples/powerpc-860-linux-gnu/crosstool.config	Tue Nov 17 11:33:59 2009 +0100
     5.3 @@ -1,7 +1,7 @@
     5.4  #
     5.5  # Automatically generated make config: don't edit
     5.6 -# crosstool-NG version: hg_default@1596_241387704817
     5.7 -# Wed Oct 28 23:16:47 2009
     5.8 +# crosstool-NG version: hg_default@1634_192aef864818
     5.9 +# Tue Nov 17 11:22:40 2009
    5.10  #
    5.11  
    5.12  #
    5.13 @@ -49,6 +49,7 @@
    5.14  # CT_PATCH_LOCAL_BUNDLED is not set
    5.15  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
    5.16  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
    5.17 +# CT_PATCH_NONE is not set
    5.18  CT_PATCH_ORDER="bundled"
    5.19  # CT_PATCH_SINGLE is not set
    5.20  # CT_PATCH_USE_LOCAL is not set
    5.21 @@ -88,6 +89,8 @@
    5.22  # CT_ARCH_64 is not set
    5.23  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
    5.24  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
    5.25 +CT_ARCH_SUPPORTS_32=y
    5.26 +# CT_ARCH_SUPPORTS_64 is not set
    5.27  # CT_ARCH_SUPPORT_ARCH is not set
    5.28  CT_ARCH_SUPPORT_ABI=y
    5.29  CT_ARCH_SUPPORT_CPU=y
    5.30 @@ -96,9 +99,13 @@
    5.31  # CT_ARCH_DEFAULT_HAS_MMU is not set
    5.32  # CT_ARCH_DEFAULT_BE is not set
    5.33  # CT_ARCH_DEFAULT_LE is not set
    5.34 +CT_ARCH_DEFAULT_32=y
    5.35 +# CT_ARCH_DEFAULT_64 is not set
    5.36  CT_ARCH_ABI=""
    5.37  CT_ARCH_CPU="860"
    5.38  CT_ARCH_TUNE=""
    5.39 +CT_ARCH_32b=y
    5.40 +# CT_ARCH_64b is not set
    5.41  # CT_ARCH_FLOAT_HW is not set
    5.42  CT_ARCH_FLOAT_SW=y
    5.43  CT_TARGET_CFLAGS=""
    5.44 @@ -113,7 +120,8 @@
    5.45  # CT_ARCH_ia64 is not set
    5.46  # CT_ARCH_mips is not set
    5.47  CT_ARCH_powerpc=y
    5.48 -# CT_ARCH_powerpc64 is not set
    5.49 +# CT_ARCH_s390 is not set
    5.50 +# CT_ARCH_s390x is not set
    5.51  # CT_ARCH_sh is not set
    5.52  # CT_ARCH_x86 is not set
    5.53  # CT_ARCH_x86_64 is not set
    5.54 @@ -265,16 +273,18 @@
    5.55  CT_CC_LANG_CXX=y
    5.56  CT_CC_LANG_FORTRAN=y
    5.57  # CT_CC_LANG_JAVA is not set
    5.58 -CT_LIBC="glibc"
    5.59  
    5.60  #
    5.61  # C-library
    5.62  #
    5.63 +CT_LIBC="glibc"
    5.64  CT_LIBC_VERSION="2.9"
    5.65  # CT_LIBC_eglibc is not set
    5.66  CT_LIBC_glibc=y
    5.67  # CT_LIBC_newlib is not set
    5.68 +# CT_LIBC_none is not set
    5.69  # CT_LIBC_uClibc is not set
    5.70 +# CT_LIBC_V_2_10_1 is not set
    5.71  CT_LIBC_V_2_9=y
    5.72  # CT_LIBC_V_2_8 is not set
    5.73  # CT_LIBC_V_2_7 is not set
    5.74 @@ -313,13 +323,13 @@
    5.75  CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
    5.76  # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
    5.77  CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
    5.78 +CT_LIBC_SUPPORT_NPTL=y
    5.79 +CT_LIBC_SUPPORT_LINUXTHREADS=y
    5.80 +CT_THREADS="nptl"
    5.81  
    5.82  #
    5.83  # Common C library options
    5.84  #
    5.85 -CT_LIBC_SUPPORT_NPTL=y
    5.86 -CT_LIBC_SUPPORT_LINUXTHREADS=y
    5.87 -CT_THREADS="nptl"
    5.88  CT_THREADS_NPTL=y
    5.89  # CT_THREADS_LINUXTHREADS is not set
    5.90  # CT_THREADS_NONE is not set
     6.1 --- a/samples/powerpc-e500v2-linux-gnuspe/crosstool.config	Tue Nov 17 09:27:38 2009 +0100
     6.2 +++ b/samples/powerpc-e500v2-linux-gnuspe/crosstool.config	Tue Nov 17 11:33:59 2009 +0100
     6.3 @@ -1,7 +1,7 @@
     6.4  #
     6.5  # Automatically generated make config: don't edit
     6.6 -# crosstool-NG version: hg_default@1596_241387704817
     6.7 -# Wed Oct 28 23:17:14 2009
     6.8 +# crosstool-NG version: hg_default@1634_192aef864818
     6.9 +# Tue Nov 17 11:23:44 2009
    6.10  #
    6.11  
    6.12  #
    6.13 @@ -50,6 +50,7 @@
    6.14  # CT_PATCH_LOCAL_BUNDLED is not set
    6.15  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
    6.16  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
    6.17 +# CT_PATCH_NONE is not set
    6.18  CT_PATCH_ORDER="bundled"
    6.19  # CT_PATCH_SINGLE is not set
    6.20  # CT_PATCH_USE_LOCAL is not set
    6.21 @@ -89,6 +90,8 @@
    6.22  # CT_ARCH_64 is not set
    6.23  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
    6.24  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
    6.25 +CT_ARCH_SUPPORTS_32=y
    6.26 +CT_ARCH_SUPPORTS_64=y
    6.27  # CT_ARCH_SUPPORT_ARCH is not set
    6.28  CT_ARCH_SUPPORT_ABI=y
    6.29  CT_ARCH_SUPPORT_CPU=y
    6.30 @@ -97,9 +100,13 @@
    6.31  # CT_ARCH_DEFAULT_HAS_MMU is not set
    6.32  # CT_ARCH_DEFAULT_BE is not set
    6.33  # CT_ARCH_DEFAULT_LE is not set
    6.34 +CT_ARCH_DEFAULT_32=y
    6.35 +# CT_ARCH_DEFAULT_64 is not set
    6.36  CT_ARCH_ABI=""
    6.37  CT_ARCH_CPU="8548"
    6.38  CT_ARCH_TUNE="8548"
    6.39 +CT_ARCH_32b=y
    6.40 +# CT_ARCH_64b is not set
    6.41  CT_ARCH_FLOAT_HW=y
    6.42  # CT_ARCH_FLOAT_SW is not set
    6.43  CT_TARGET_CFLAGS="-mfloat-gprs=double -Wa,-me500x2"
    6.44 @@ -114,7 +121,8 @@
    6.45  # CT_ARCH_ia64 is not set
    6.46  # CT_ARCH_mips is not set
    6.47  CT_ARCH_powerpc=y
    6.48 -# CT_ARCH_powerpc64 is not set
    6.49 +# CT_ARCH_s390 is not set
    6.50 +# CT_ARCH_s390x is not set
    6.51  # CT_ARCH_sh is not set
    6.52  # CT_ARCH_x86 is not set
    6.53  # CT_ARCH_x86_64 is not set
    6.54 @@ -269,15 +277,16 @@
    6.55  # CT_CC_LANG_OBJC is not set
    6.56  # CT_CC_LANG_OBJCXX is not set
    6.57  CT_CC_LANG_OTHERS=""
    6.58 -CT_LIBC="eglibc"
    6.59  
    6.60  #
    6.61  # C-library
    6.62  #
    6.63 +CT_LIBC="eglibc"
    6.64  CT_LIBC_VERSION="2_9"
    6.65  CT_LIBC_eglibc=y
    6.66  # CT_LIBC_glibc is not set
    6.67  # CT_LIBC_newlib is not set
    6.68 +# CT_LIBC_none is not set
    6.69  # CT_LIBC_uClibc is not set
    6.70  # CT_LIBC_V_2_10 is not set
    6.71  CT_EGLIBC_V_2_9=y
    6.72 @@ -303,13 +312,13 @@
    6.73  CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
    6.74  # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
    6.75  CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
    6.76 +CT_LIBC_SUPPORT_NPTL=y
    6.77 +CT_LIBC_SUPPORT_LINUXTHREADS=y
    6.78 +CT_THREADS="nptl"
    6.79  
    6.80  #
    6.81  # Common C library options
    6.82  #
    6.83 -CT_LIBC_SUPPORT_NPTL=y
    6.84 -CT_LIBC_SUPPORT_LINUXTHREADS=y
    6.85 -CT_THREADS="nptl"
    6.86  CT_THREADS_NPTL=y
    6.87  # CT_THREADS_LINUXTHREADS is not set
    6.88  # CT_THREADS_NONE is not set
     7.1 --- a/samples/powerpc-unknown-linux-gnu/crosstool.config	Tue Nov 17 09:27:38 2009 +0100
     7.2 +++ b/samples/powerpc-unknown-linux-gnu/crosstool.config	Tue Nov 17 11:33:59 2009 +0100
     7.3 @@ -1,7 +1,7 @@
     7.4  #
     7.5  # Automatically generated make config: don't edit
     7.6 -# crosstool-NG version: hg_default@1596_241387704817
     7.7 -# Wed Oct 28 23:18:06 2009
     7.8 +# crosstool-NG version: hg_default@1634_192aef864818
     7.9 +# Tue Nov 17 11:29:28 2009
    7.10  #
    7.11  
    7.12  #
    7.13 @@ -49,6 +49,7 @@
    7.14  # CT_PATCH_LOCAL_BUNDLED is not set
    7.15  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
    7.16  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
    7.17 +# CT_PATCH_NONE is not set
    7.18  CT_PATCH_ORDER="bundled"
    7.19  # CT_PATCH_SINGLE is not set
    7.20  # CT_PATCH_USE_LOCAL is not set
    7.21 @@ -88,6 +89,8 @@
    7.22  # CT_ARCH_64 is not set
    7.23  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
    7.24  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
    7.25 +CT_ARCH_SUPPORTS_32=y
    7.26 +# CT_ARCH_SUPPORTS_64 is not set
    7.27  # CT_ARCH_SUPPORT_ARCH is not set
    7.28  CT_ARCH_SUPPORT_ABI=y
    7.29  CT_ARCH_SUPPORT_CPU=y
    7.30 @@ -96,9 +99,13 @@
    7.31  # CT_ARCH_DEFAULT_HAS_MMU is not set
    7.32  # CT_ARCH_DEFAULT_BE is not set
    7.33  # CT_ARCH_DEFAULT_LE is not set
    7.34 +CT_ARCH_DEFAULT_32=y
    7.35 +# CT_ARCH_DEFAULT_64 is not set
    7.36  CT_ARCH_ABI=""
    7.37  CT_ARCH_CPU=""
    7.38  CT_ARCH_TUNE=""
    7.39 +CT_ARCH_32b=y
    7.40 +# CT_ARCH_64b is not set
    7.41  CT_ARCH_FLOAT_HW=y
    7.42  # CT_ARCH_FLOAT_SW is not set
    7.43  CT_TARGET_CFLAGS=""
    7.44 @@ -113,7 +120,8 @@
    7.45  # CT_ARCH_ia64 is not set
    7.46  # CT_ARCH_mips is not set
    7.47  CT_ARCH_powerpc=y
    7.48 -# CT_ARCH_powerpc64 is not set
    7.49 +# CT_ARCH_s390 is not set
    7.50 +# CT_ARCH_s390x is not set
    7.51  # CT_ARCH_sh is not set
    7.52  # CT_ARCH_x86 is not set
    7.53  # CT_ARCH_x86_64 is not set
    7.54 @@ -266,16 +274,18 @@
    7.55  CT_CC_LANG_CXX=y
    7.56  CT_CC_LANG_FORTRAN=y
    7.57  CT_CC_LANG_JAVA=y
    7.58 -CT_LIBC="glibc"
    7.59  
    7.60  #
    7.61  # C-library
    7.62  #
    7.63 +CT_LIBC="glibc"
    7.64  CT_LIBC_VERSION="2.9"
    7.65  # CT_LIBC_eglibc is not set
    7.66  CT_LIBC_glibc=y
    7.67  # CT_LIBC_newlib is not set
    7.68 +# CT_LIBC_none is not set
    7.69  # CT_LIBC_uClibc is not set
    7.70 +# CT_LIBC_V_2_10_1 is not set
    7.71  CT_LIBC_V_2_9=y
    7.72  # CT_LIBC_V_2_8 is not set
    7.73  # CT_LIBC_V_2_7 is not set
    7.74 @@ -301,13 +311,13 @@
    7.75  CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
    7.76  # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
    7.77  CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
    7.78 +CT_LIBC_SUPPORT_NPTL=y
    7.79 +CT_LIBC_SUPPORT_LINUXTHREADS=y
    7.80 +CT_THREADS="nptl"
    7.81  
    7.82  #
    7.83  # Common C library options
    7.84  #
    7.85 -CT_LIBC_SUPPORT_NPTL=y
    7.86 -CT_LIBC_SUPPORT_LINUXTHREADS=y
    7.87 -CT_THREADS="nptl"
    7.88  CT_THREADS_NPTL=y
    7.89  # CT_THREADS_LINUXTHREADS is not set
    7.90  # CT_THREADS_NONE is not set
     8.1 --- a/samples/powerpc-unknown-linux-uclibc/crosstool.config	Tue Nov 17 09:27:38 2009 +0100
     8.2 +++ b/samples/powerpc-unknown-linux-uclibc/crosstool.config	Tue Nov 17 11:33:59 2009 +0100
     8.3 @@ -1,7 +1,7 @@
     8.4  #
     8.5  # Automatically generated make config: don't edit
     8.6 -# crosstool-NG version: hg_default@1596_241387704817
     8.7 -# Wed Oct 28 23:18:19 2009
     8.8 +# crosstool-NG version: hg_default@1634_192aef864818
     8.9 +# Tue Nov 17 11:24:26 2009
    8.10  #
    8.11  
    8.12  #
    8.13 @@ -49,6 +49,7 @@
    8.14  # CT_PATCH_LOCAL_BUNDLED is not set
    8.15  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
    8.16  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
    8.17 +# CT_PATCH_NONE is not set
    8.18  CT_PATCH_ORDER="bundled"
    8.19  # CT_PATCH_SINGLE is not set
    8.20  # CT_PATCH_USE_LOCAL is not set
    8.21 @@ -88,6 +89,8 @@
    8.22  # CT_ARCH_64 is not set
    8.23  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
    8.24  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
    8.25 +CT_ARCH_SUPPORTS_32=y
    8.26 +# CT_ARCH_SUPPORTS_64 is not set
    8.27  # CT_ARCH_SUPPORT_ARCH is not set
    8.28  CT_ARCH_SUPPORT_ABI=y
    8.29  CT_ARCH_SUPPORT_CPU=y
    8.30 @@ -96,9 +99,13 @@
    8.31  # CT_ARCH_DEFAULT_HAS_MMU is not set
    8.32  # CT_ARCH_DEFAULT_BE is not set
    8.33  # CT_ARCH_DEFAULT_LE is not set
    8.34 +CT_ARCH_DEFAULT_32=y
    8.35 +# CT_ARCH_DEFAULT_64 is not set
    8.36  CT_ARCH_ABI=""
    8.37  CT_ARCH_CPU=""
    8.38  CT_ARCH_TUNE=""
    8.39 +CT_ARCH_32b=y
    8.40 +# CT_ARCH_64b is not set
    8.41  # CT_ARCH_FLOAT_HW is not set
    8.42  CT_ARCH_FLOAT_SW=y
    8.43  CT_TARGET_CFLAGS=""
    8.44 @@ -113,7 +120,8 @@
    8.45  # CT_ARCH_ia64 is not set
    8.46  # CT_ARCH_mips is not set
    8.47  CT_ARCH_powerpc=y
    8.48 -# CT_ARCH_powerpc64 is not set
    8.49 +# CT_ARCH_s390 is not set
    8.50 +# CT_ARCH_s390x is not set
    8.51  # CT_ARCH_sh is not set
    8.52  # CT_ARCH_x86 is not set
    8.53  # CT_ARCH_x86_64 is not set
    8.54 @@ -263,15 +271,16 @@
    8.55  CT_CC_LANG_CXX=y
    8.56  CT_CC_LANG_FORTRAN=y
    8.57  # CT_CC_LANG_JAVA is not set
    8.58 -CT_LIBC="uClibc"
    8.59  
    8.60  #
    8.61  # C-library
    8.62  #
    8.63 +CT_LIBC="uClibc"
    8.64  CT_LIBC_VERSION="0.9.30.1"
    8.65  # CT_LIBC_eglibc is not set
    8.66  # CT_LIBC_glibc is not set
    8.67  # CT_LIBC_newlib is not set
    8.68 +# CT_LIBC_none is not set
    8.69  CT_LIBC_uClibc=y
    8.70  CT_LIBC_V_0_9_30_1=y
    8.71  # CT_LIBC_V_0_9_30 is not set
    8.72 @@ -291,13 +300,13 @@
    8.73  CT_LIBC_UCLIBC_BUILD_CROSS_LDD=y
    8.74  CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
    8.75  # CT_LIBC_UCLIBC_LOCALES is not set
    8.76 +# CT_LIBC_SUPPORT_NPTL is not set
    8.77 +CT_LIBC_SUPPORT_LINUXTHREADS=y
    8.78 +CT_THREADS="linuxthreads"
    8.79  
    8.80  #
    8.81  # Common C library options
    8.82  #
    8.83 -# CT_LIBC_SUPPORT_NPTL is not set
    8.84 -CT_LIBC_SUPPORT_LINUXTHREADS=y
    8.85 -CT_THREADS="linuxthreads"
    8.86  # CT_THREADS_NPTL is not set
    8.87  CT_THREADS_LINUXTHREADS=y
    8.88  # CT_THREADS_NONE is not set
     9.1 --- a/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config	Tue Nov 17 09:27:38 2009 +0100
     9.2 +++ b/samples/powerpc-unknown_nofpu-linux-gnu/crosstool.config	Tue Nov 17 11:33:59 2009 +0100
     9.3 @@ -1,7 +1,7 @@
     9.4  #
     9.5  # Automatically generated make config: don't edit
     9.6 -# crosstool-NG version: hg_default@1596_241387704817
     9.7 -# Wed Oct 28 23:18:40 2009
     9.8 +# crosstool-NG version: hg_default@1634_192aef864818
     9.9 +# Tue Nov 17 11:24:42 2009
    9.10  #
    9.11  
    9.12  #
    9.13 @@ -49,6 +49,7 @@
    9.14  # CT_PATCH_LOCAL_BUNDLED is not set
    9.15  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
    9.16  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
    9.17 +# CT_PATCH_NONE is not set
    9.18  CT_PATCH_ORDER="bundled"
    9.19  # CT_PATCH_SINGLE is not set
    9.20  # CT_PATCH_USE_LOCAL is not set
    9.21 @@ -88,6 +89,8 @@
    9.22  # CT_ARCH_64 is not set
    9.23  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
    9.24  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
    9.25 +CT_ARCH_SUPPORTS_32=y
    9.26 +# CT_ARCH_SUPPORTS_64 is not set
    9.27  # CT_ARCH_SUPPORT_ARCH is not set
    9.28  CT_ARCH_SUPPORT_ABI=y
    9.29  CT_ARCH_SUPPORT_CPU=y
    9.30 @@ -96,9 +99,13 @@
    9.31  # CT_ARCH_DEFAULT_HAS_MMU is not set
    9.32  # CT_ARCH_DEFAULT_BE is not set
    9.33  # CT_ARCH_DEFAULT_LE is not set
    9.34 +CT_ARCH_DEFAULT_32=y
    9.35 +# CT_ARCH_DEFAULT_64 is not set
    9.36  CT_ARCH_ABI=""
    9.37  CT_ARCH_CPU=""
    9.38  CT_ARCH_TUNE=""
    9.39 +CT_ARCH_32b=y
    9.40 +# CT_ARCH_64b is not set
    9.41  # CT_ARCH_FLOAT_HW is not set
    9.42  CT_ARCH_FLOAT_SW=y
    9.43  CT_TARGET_CFLAGS=""
    9.44 @@ -113,7 +120,8 @@
    9.45  # CT_ARCH_ia64 is not set
    9.46  # CT_ARCH_mips is not set
    9.47  CT_ARCH_powerpc=y
    9.48 -# CT_ARCH_powerpc64 is not set
    9.49 +# CT_ARCH_s390 is not set
    9.50 +# CT_ARCH_s390x is not set
    9.51  # CT_ARCH_sh is not set
    9.52  # CT_ARCH_x86 is not set
    9.53  # CT_ARCH_x86_64 is not set
    9.54 @@ -266,16 +274,18 @@
    9.55  CT_CC_LANG_CXX=y
    9.56  CT_CC_LANG_FORTRAN=y
    9.57  CT_CC_LANG_JAVA=y
    9.58 -CT_LIBC="glibc"
    9.59  
    9.60  #
    9.61  # C-library
    9.62  #
    9.63 +CT_LIBC="glibc"
    9.64  CT_LIBC_VERSION="2.9"
    9.65  # CT_LIBC_eglibc is not set
    9.66  CT_LIBC_glibc=y
    9.67  # CT_LIBC_newlib is not set
    9.68 +# CT_LIBC_none is not set
    9.69  # CT_LIBC_uClibc is not set
    9.70 +# CT_LIBC_V_2_10_1 is not set
    9.71  CT_LIBC_V_2_9=y
    9.72  # CT_LIBC_V_2_8 is not set
    9.73  # CT_LIBC_V_2_7 is not set
    9.74 @@ -314,13 +324,13 @@
    9.75  CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
    9.76  # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
    9.77  CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
    9.78 +CT_LIBC_SUPPORT_NPTL=y
    9.79 +CT_LIBC_SUPPORT_LINUXTHREADS=y
    9.80 +CT_THREADS="nptl"
    9.81  
    9.82  #
    9.83  # Common C library options
    9.84  #
    9.85 -CT_LIBC_SUPPORT_NPTL=y
    9.86 -CT_LIBC_SUPPORT_LINUXTHREADS=y
    9.87 -CT_THREADS="nptl"
    9.88  CT_THREADS_NPTL=y
    9.89  # CT_THREADS_LINUXTHREADS is not set
    9.90  # CT_THREADS_NONE is not set
    10.1 --- a/samples/powerpc64-unknown-linux-gnu/crosstool.config	Tue Nov 17 09:27:38 2009 +0100
    10.2 +++ b/samples/powerpc64-unknown-linux-gnu/crosstool.config	Tue Nov 17 11:33:59 2009 +0100
    10.3 @@ -1,7 +1,7 @@
    10.4  #
    10.5  # Automatically generated make config: don't edit
    10.6 -# crosstool-NG version: hg_default@1596_241387704817
    10.7 -# Wed Oct 28 23:19:09 2009
    10.8 +# crosstool-NG version: hg_default@1634_192aef864818
    10.9 +# Tue Nov 17 11:32:49 2009
   10.10  #
   10.11  
   10.12  #
   10.13 @@ -50,6 +50,7 @@
   10.14  # CT_PATCH_LOCAL_BUNDLED is not set
   10.15  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
   10.16  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
   10.17 +# CT_PATCH_NONE is not set
   10.18  CT_PATCH_ORDER="bundled"
   10.19  # CT_PATCH_SINGLE is not set
   10.20  # CT_PATCH_USE_LOCAL is not set
   10.21 @@ -85,10 +86,12 @@
   10.22  #
   10.23  # Target options
   10.24  #
   10.25 -CT_ARCH="powerpc64"
   10.26 +CT_ARCH="powerpc"
   10.27  CT_ARCH_64=y
   10.28  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
   10.29  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
   10.30 +CT_ARCH_SUPPORTS_32=y
   10.31 +CT_ARCH_SUPPORTS_64=y
   10.32  # CT_ARCH_SUPPORT_ARCH is not set
   10.33  CT_ARCH_SUPPORT_ABI=y
   10.34  CT_ARCH_SUPPORT_CPU=y
   10.35 @@ -97,9 +100,13 @@
   10.36  # CT_ARCH_DEFAULT_HAS_MMU is not set
   10.37  # CT_ARCH_DEFAULT_BE is not set
   10.38  # CT_ARCH_DEFAULT_LE is not set
   10.39 +CT_ARCH_DEFAULT_32=y
   10.40 +# CT_ARCH_DEFAULT_64 is not set
   10.41  CT_ARCH_ABI=""
   10.42  CT_ARCH_CPU=""
   10.43  CT_ARCH_TUNE=""
   10.44 +# CT_ARCH_32b is not set
   10.45 +CT_ARCH_64b=y
   10.46  CT_ARCH_FLOAT_HW=y
   10.47  # CT_ARCH_FLOAT_SW is not set
   10.48  CT_TARGET_CFLAGS=""
   10.49 @@ -113,8 +120,9 @@
   10.50  # CT_ARCH_avr32 is not set
   10.51  # CT_ARCH_ia64 is not set
   10.52  # CT_ARCH_mips is not set
   10.53 -# CT_ARCH_powerpc is not set
   10.54 -CT_ARCH_powerpc64=y
   10.55 +CT_ARCH_powerpc=y
   10.56 +# CT_ARCH_s390 is not set
   10.57 +# CT_ARCH_s390x is not set
   10.58  # CT_ARCH_sh is not set
   10.59  # CT_ARCH_x86 is not set
   10.60  # CT_ARCH_x86_64 is not set
   10.61 @@ -271,16 +279,18 @@
   10.62  # CT_CC_LANG_OBJC is not set
   10.63  # CT_CC_LANG_OBJCXX is not set
   10.64  CT_CC_LANG_OTHERS=""
   10.65 -CT_LIBC="glibc"
   10.66  
   10.67  #
   10.68  # C-library
   10.69  #
   10.70 +CT_LIBC="glibc"
   10.71  CT_LIBC_VERSION="2.9"
   10.72  # CT_LIBC_eglibc is not set
   10.73  CT_LIBC_glibc=y
   10.74  # CT_LIBC_newlib is not set
   10.75 +# CT_LIBC_none is not set
   10.76  # CT_LIBC_uClibc is not set
   10.77 +# CT_LIBC_V_2_10_1 is not set
   10.78  CT_LIBC_V_2_9=y
   10.79  # CT_LIBC_V_2_8 is not set
   10.80  # CT_LIBC_V_2_7 is not set
   10.81 @@ -306,13 +316,13 @@
   10.82  CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
   10.83  # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
   10.84  CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
   10.85 +CT_LIBC_SUPPORT_NPTL=y
   10.86 +CT_LIBC_SUPPORT_LINUXTHREADS=y
   10.87 +CT_THREADS="nptl"
   10.88  
   10.89  #
   10.90  # Common C library options
   10.91  #
   10.92 -CT_LIBC_SUPPORT_NPTL=y
   10.93 -CT_LIBC_SUPPORT_LINUXTHREADS=y
   10.94 -CT_THREADS="nptl"
   10.95  CT_THREADS_NPTL=y
   10.96  # CT_THREADS_LINUXTHREADS is not set
   10.97  # CT_THREADS_NONE is not set
    11.1 --- a/scripts/build/arch/powerpc-powerpc64.sh-common	Tue Nov 17 09:27:38 2009 +0100
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,22 +0,0 @@
    11.4 -# Compute powerpc-specific values
    11.5 -
    11.6 -CT_DoArchTupleValues () {
    11.7 -    # The architecture part of the tuple:
    11.8 -    CT_TARGET_ARCH="${CT_ARCH}"
    11.9 -
   11.10 -    # The kernel ARCH:
   11.11 -    CT_KERNEL_ARCH=powerpc
   11.12 -
   11.13 -    # Add spe in the tuplet if needed
   11.14 -    case "${CT_LIBC},${CT_ARCH_POWERPC_SPE}" in
   11.15 -        glibc,|eglibc,)   CT_TARGET_SYS=gnu;;
   11.16 -        glibc,y|eglibc,y) CT_TARGET_SYS=gnuspe;;
   11.17 -    esac
   11.18 -
   11.19 -    # Add extra flags for SPE if needed
   11.20 -    if [ "${CT_ARCH_POWERPC_SPE}" = "y" ]; then
   11.21 -        CT_ARCH_TARGET_CFLAGS="-mabi=spe -mspe"
   11.22 -        CT_ARCH_CC_CORE_EXTRA_CONFIG="--enable-e500_double"
   11.23 -        CT_ARCH_CC_EXTRA_CONFIG="--enable-e500_double"
   11.24 -    fi
   11.25 -}
    12.1 --- a/scripts/build/arch/powerpc.sh	Tue Nov 17 09:27:38 2009 +0100
    12.2 +++ b/scripts/build/arch/powerpc.sh	Tue Nov 17 11:33:59 2009 +0100
    12.3 @@ -1,3 +1,21 @@
    12.4  # Compute powerpc-specific values
    12.5  
    12.6 -. "${CT_LIB_DIR}/scripts/build/arch/powerpc-powerpc64.sh-common"
    12.7 +CT_DoArchTupleValues () {
    12.8 +    # The architecture part of the tuple, override only for 64-bit
    12.9 +    if [ "${CT_ARCH_64}" = "y" ]; then
   12.10 +        CT_TARGET_ARCH="powerpc64"
   12.11 +    fi
   12.12 +
   12.13 +    # Add spe in the tuple if needed
   12.14 +    case "${CT_LIBC},${CT_ARCH_POWERPC_SPE}" in
   12.15 +        glibc,|eglibc,)   CT_TARGET_SYS=gnu;;
   12.16 +        glibc,y|eglibc,y) CT_TARGET_SYS=gnuspe;;
   12.17 +    esac
   12.18 +
   12.19 +    # Add extra flags for SPE if needed
   12.20 +    if [ "${CT_ARCH_POWERPC_SPE}" = "y" ]; then
   12.21 +        CT_ARCH_TARGET_CFLAGS="-mabi=spe -mspe"
   12.22 +        CT_ARCH_CC_CORE_EXTRA_CONFIG="--enable-e500_double"
   12.23 +        CT_ARCH_CC_EXTRA_CONFIG="--enable-e500_double"
   12.24 +    fi
   12.25 +}
    13.1 --- a/scripts/build/arch/powerpc64.sh	Tue Nov 17 09:27:38 2009 +0100
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,3 +0,0 @@
    13.4 -# Compute powerpc-specific values
    13.5 -
    13.6 -. "${CT_LIB_DIR}/scripts/build/arch/powerpc-powerpc64.sh-common"