1.1 --- a/config/arch/s390.in	Tue Nov 17 11:51:57 2009 +0100
     1.2 +++ b/config/arch/s390.in	Tue Nov 17 11:54:44 2009 +0100
     1.3 @@ -2,8 +2,12 @@
     1.4  # depends on EXPERIMENTAL
     1.5  
     1.6  config ARCH_s390
     1.7 +    select ARCH_SUPPORTS_32
     1.8 +    select ARCH_SUPPORTS_64
     1.9 +    select ARCH_DEFAULT_32
    1.10      select ARCH_USE_MMU
    1.11      select ARCH_SUPPORT_FPU
    1.12      help
    1.13 -      The IBM ESA/390 architecture, as defined by:
    1.14 -        http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
    1.15 +      Defined by IBM in:
    1.16 +        32-bit ESA/390       : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
    1.17 +        64-bit z/Architecure : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS

     2.1 --- a/config/arch/s390x.in	Tue Nov 17 11:51:57 2009 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,10 +0,0 @@
     2.4 -# s390x specific config options
     2.5 -# depends on EXPERIMENTAL
     2.6 -
     2.7 -config ARCH_s390x
     2.8 -    select ARCH_64
     2.9 -    select ARCH_USE_MMU
    2.10 -    select ARCH_SUPPORT_FPU
    2.11 -    help
    2.12 -      The IBM z/Architecture, as defined by:
    2.13 -        http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS

     3.1 --- a/samples/s390-ibm-linux-gnu/crosstool.config	Tue Nov 17 11:51:57 2009 +0100
     3.2 +++ b/samples/s390-ibm-linux-gnu/crosstool.config	Tue Nov 17 11:54:44 2009 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  #
     3.5  # Automatically generated make config: don't edit
     3.6 -# crosstool-NG version: hg_default@1629_f67c0106cefc
     3.7 -# Mon Nov 16 20:16:20 2009
     3.8 +# crosstool-NG version: hg_default@1636_2ed5947c896a
     3.9 +# Tue Nov 17 11:53:01 2009
    3.10  #
    3.11  
    3.12  #
    3.13 @@ -87,6 +87,8 @@
    3.14  # CT_ARCH_64 is not set
    3.15  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
    3.16  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
    3.17 +CT_ARCH_SUPPORTS_32=y
    3.18 +CT_ARCH_SUPPORTS_64=y
    3.19  # CT_ARCH_SUPPORT_ARCH is not set
    3.20  # CT_ARCH_SUPPORT_ABI is not set
    3.21  # CT_ARCH_SUPPORT_CPU is not set
    3.22 @@ -95,7 +97,11 @@
    3.23  # CT_ARCH_DEFAULT_HAS_MMU is not set
    3.24  # CT_ARCH_DEFAULT_BE is not set
    3.25  # CT_ARCH_DEFAULT_LE is not set
    3.26 +CT_ARCH_DEFAULT_32=y
    3.27 +# CT_ARCH_DEFAULT_64 is not set
    3.28  CT_ARCH_FPU=""
    3.29 +CT_ARCH_32b=y
    3.30 +# CT_ARCH_64b is not set
    3.31  CT_ARCH_FLOAT_HW=y
    3.32  # CT_ARCH_FLOAT_SW is not set
    3.33  CT_TARGET_CFLAGS=""
    3.34 @@ -110,12 +116,9 @@
    3.35  # CT_ARCH_ia64 is not set
    3.36  # CT_ARCH_mips is not set
    3.37  # CT_ARCH_powerpc is not set
    3.38 -# CT_ARCH_powerpc64 is not set
    3.39  CT_ARCH_s390=y
    3.40 -# CT_ARCH_s390x is not set
    3.41  # CT_ARCH_sh is not set
    3.42  # CT_ARCH_x86 is not set
    3.43 -# CT_ARCH_x86_64 is not set
    3.44  CT_ARCH_USE_MMU=y
    3.45  
    3.46  #

     4.1 --- a/samples/s390x-ibm-linux-gnu/crosstool.config	Tue Nov 17 11:51:57 2009 +0100
     4.2 +++ b/samples/s390x-ibm-linux-gnu/crosstool.config	Tue Nov 17 11:54:44 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@1629_f67c0106cefc
     4.7 -# Mon Nov 16 20:16:32 2009
     4.8 +# crosstool-NG version: hg_default@1636_2ed5947c896a
     4.9 +# Tue Nov 17 11:54:19 2009
    4.10  #
    4.11  
    4.12  #
    4.13 @@ -83,10 +83,12 @@
    4.14  #
    4.15  # Target options
    4.16  #
    4.17 -CT_ARCH="s390x"
    4.18 +CT_ARCH="s390"
    4.19  CT_ARCH_64=y
    4.20  # CT_ARCH_SUPPORTS_BOTH_MMU is not set
    4.21  # CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
    4.22 +CT_ARCH_SUPPORTS_32=y
    4.23 +CT_ARCH_SUPPORTS_64=y
    4.24  # CT_ARCH_SUPPORT_ARCH is not set
    4.25  # CT_ARCH_SUPPORT_ABI is not set
    4.26  # CT_ARCH_SUPPORT_CPU is not set
    4.27 @@ -95,7 +97,11 @@
    4.28  # CT_ARCH_DEFAULT_HAS_MMU is not set
    4.29  # CT_ARCH_DEFAULT_BE is not set
    4.30  # CT_ARCH_DEFAULT_LE is not set
    4.31 +CT_ARCH_DEFAULT_32=y
    4.32 +# CT_ARCH_DEFAULT_64 is not set
    4.33  CT_ARCH_FPU=""
    4.34 +# CT_ARCH_32b is not set
    4.35 +CT_ARCH_64b=y
    4.36  CT_ARCH_FLOAT_HW=y
    4.37  # CT_ARCH_FLOAT_SW is not set
    4.38  CT_TARGET_CFLAGS=""
    4.39 @@ -110,12 +116,15 @@
    4.40  # CT_ARCH_ia64 is not set
    4.41  # CT_ARCH_mips is not set
    4.42  # CT_ARCH_powerpc is not set
    4.43 -# CT_ARCH_powerpc64 is not set
    4.44 -# CT_ARCH_s390 is not set
    4.45 -CT_ARCH_s390x=y
    4.46 +CT_ARCH_s390=y
    4.47  # CT_ARCH_sh is not set
    4.48  # CT_ARCH_x86 is not set
    4.49 -# CT_ARCH_x86_64 is not set
    4.50 +# CT_ARCH_ALPHA_EV4 is not set
    4.51 +# CT_ARCH_ALPHA_EV45 is not set
    4.52 +# CT_ARCH_ALPHA_EV5 is not set
    4.53 +# CT_ARCH_ALPHA_EV56 is not set
    4.54 +# CT_ARCH_ALPHA_EV6 is not set
    4.55 +# CT_ARCH_ALPHA_EV67 is not set
    4.56  CT_ARCH_USE_MMU=y
    4.57  
    4.58  #

     5.1 --- a/scripts/build/arch/s390.sh	Tue Nov 17 11:51:57 2009 +0100
     5.2 +++ b/scripts/build/arch/s390.sh	Tue Nov 17 11:54:44 2009 +0100
     5.3 @@ -1,6 +1,8 @@
     5.4  # Compute s390-specific values
     5.5  
     5.6  CT_DoArchTupleValues() {
     5.7 -    # Defaults are all OK for s390
     5.8 -    :
     5.9 +    # That's the only thing to override
    5.10 +    if [ "${CT_ARCH_64}" = "y" ]; then
    5.11 +        CT_TARGET_ARCH="s390x"
    5.12 +    fi
    5.13  }

     6.1 --- a/scripts/build/arch/s390x.sh	Tue Nov 17 11:51:57 2009 +0100
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,6 +0,0 @@
     6.4 -# Compute s390x-specific values
     6.5 -
     6.6 -CT_DoArchTupleValues() {
     6.7 -    # The kernel architecture is the same name as for the 32-bit version:
     6.8 -    CT_KERNEL_ARCH="s390"
     6.9 -}