arch/s390: cleanups
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Nov 16 20:18:09 2009 +0100 (2009-11-16)
changeset 163114abcd185e4b
parent 1630 1409ba438ea1
child 1632 c7d0e5a017c9
arch/s390: cleanups

Don't select unneeded config knobs. Don't select non-existing config knobs.
Use the "no patch" config knob, instead of pointing to an non-exiting local
patch dir. Simplify the tuple-related scripts. Update the samples.
config/arch/s390.in
config/arch/s390x.in
samples/s390-ibm-linux-gnu/crosstool.config
samples/s390-ibm-linux-gnu/reported.by
samples/s390x-ibm-linux-gnu/crosstool.config
samples/s390x-ibm-linux-gnu/reported.by
scripts/build/arch/s390.sh
scripts/build/arch/s390x.sh
     1.1 --- a/config/arch/s390.in	Mon Nov 16 20:15:45 2009 +0100
     1.2 +++ b/config/arch/s390.in	Mon Nov 16 20:18:09 2009 +0100
     1.3 @@ -4,9 +4,6 @@
     1.4  config ARCH_s390
     1.5      select ARCH_USE_MMU
     1.6      select ARCH_SUPPORT_FPU
     1.7 -    select ARCH_DEFAULT_HAS_MMU
     1.8 -    select ARCH_DEFAULT_BE
     1.9 -    select CT_THREAD
    1.10      help
    1.11        The IBM ESA/390 architecture, as defined by:
    1.12          http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
     2.1 --- a/config/arch/s390x.in	Mon Nov 16 20:15:45 2009 +0100
     2.2 +++ b/config/arch/s390x.in	Mon Nov 16 20:18:09 2009 +0100
     2.3 @@ -5,9 +5,6 @@
     2.4      select ARCH_64
     2.5      select ARCH_USE_MMU
     2.6      select ARCH_SUPPORT_FPU
     2.7 -    select ARCH_DEFAULT_HAS_MMU
     2.8 -    select ARCH_DEFAULT_BE
     2.9 -    select CT_THREAD
    2.10      help
    2.11        The IBM z/Architecture, as defined by:
    2.12          http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS
     3.1 --- a/samples/s390-ibm-linux-gnu/crosstool.config	Mon Nov 16 20:15:45 2009 +0100
     3.2 +++ b/samples/s390-ibm-linux-gnu/crosstool.config	Mon Nov 16 20:18:09 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@1620_187e06178dcb
     3.7 -# Sat Nov 14 08:15:54 2009
     3.8 +# crosstool-NG version: hg_default@1629_f67c0106cefc
     3.9 +# Mon Nov 16 20:16:20 2009
    3.10  #
    3.11  
    3.12  #
    3.13 @@ -42,15 +42,15 @@
    3.14  CT_OVERIDE_CONFIG_GUESS_SUB=y
    3.15  # CT_ONLY_EXTRACT is not set
    3.16  # CT_PATCH_BUNDLED is not set
    3.17 -CT_PATCH_LOCAL=y
    3.18 +# CT_PATCH_LOCAL is not set
    3.19  # CT_PATCH_BUNDLED_LOCAL is not set
    3.20  # CT_PATCH_LOCAL_BUNDLED is not set
    3.21  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
    3.22  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
    3.23 -CT_PATCH_ORDER="local"
    3.24 +CT_PATCH_NONE=y
    3.25 +CT_PATCH_ORDER="none"
    3.26  # CT_PATCH_SINGLE is not set
    3.27 -CT_PATCH_USE_LOCAL=y
    3.28 -CT_LOCAL_PATCH_DIR=""
    3.29 +# CT_PATCH_USE_LOCAL is not set
    3.30  
    3.31  #
    3.32  # Build behavior
    3.33 @@ -92,8 +92,8 @@
    3.34  # CT_ARCH_SUPPORT_CPU is not set
    3.35  # CT_ARCH_SUPPORT_TUNE is not set
    3.36  CT_ARCH_SUPPORT_FPU=y
    3.37 -CT_ARCH_DEFAULT_HAS_MMU=y
    3.38 -CT_ARCH_DEFAULT_BE=y
    3.39 +# CT_ARCH_DEFAULT_HAS_MMU is not set
    3.40 +# CT_ARCH_DEFAULT_BE is not set
    3.41  # CT_ARCH_DEFAULT_LE is not set
    3.42  CT_ARCH_FPU=""
    3.43  CT_ARCH_FLOAT_HW=y
    3.44 @@ -109,13 +109,13 @@
    3.45  # CT_ARCH_avr32 is not set
    3.46  # CT_ARCH_ia64 is not set
    3.47  # CT_ARCH_mips is not set
    3.48 +# CT_ARCH_powerpc is not set
    3.49  # CT_ARCH_powerpc64 is not set
    3.50 -# CT_ARCH_powerpc is not set
    3.51  CT_ARCH_s390=y
    3.52  # CT_ARCH_s390x is not set
    3.53  # CT_ARCH_sh is not set
    3.54 +# CT_ARCH_x86 is not set
    3.55  # CT_ARCH_x86_64 is not set
    3.56 -# CT_ARCH_x86 is not set
    3.57  CT_ARCH_USE_MMU=y
    3.58  
    3.59  #
    3.60 @@ -278,6 +278,7 @@
    3.61  # CT_LIBC_newlib is not set
    3.62  # CT_LIBC_none is not set
    3.63  # CT_LIBC_uClibc is not set
    3.64 +# CT_LIBC_V_2_10_1 is not set
    3.65  CT_LIBC_V_2_9=y
    3.66  # CT_LIBC_V_2_8 is not set
    3.67  # CT_LIBC_V_2_7 is not set
     4.1 --- a/samples/s390-ibm-linux-gnu/reported.by	Mon Nov 16 20:15:45 2009 +0100
     4.2 +++ b/samples/s390-ibm-linux-gnu/reported.by	Mon Nov 16 20:18:09 2009 +0100
     4.3 @@ -1,3 +1,3 @@
     4.4  reporter_name="Harold Grovesteen"
     4.5 -reporter_url=""
     4.6 +reporter_url="http://sourceware.org/ml/crossgcc/2009-11/msg00052.html"
     4.7  reporter_comment=""
     5.1 --- a/samples/s390x-ibm-linux-gnu/crosstool.config	Mon Nov 16 20:15:45 2009 +0100
     5.2 +++ b/samples/s390x-ibm-linux-gnu/crosstool.config	Mon Nov 16 20:18:09 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@1620_187e06178dcb
     5.7 -# Sat Nov 14 09:39:36 2009
     5.8 +# crosstool-NG version: hg_default@1629_f67c0106cefc
     5.9 +# Mon Nov 16 20:16:32 2009
    5.10  #
    5.11  
    5.12  #
    5.13 @@ -42,15 +42,15 @@
    5.14  CT_OVERIDE_CONFIG_GUESS_SUB=y
    5.15  # CT_ONLY_EXTRACT is not set
    5.16  # CT_PATCH_BUNDLED is not set
    5.17 -CT_PATCH_LOCAL=y
    5.18 +# CT_PATCH_LOCAL is not set
    5.19  # CT_PATCH_BUNDLED_LOCAL is not set
    5.20  # CT_PATCH_LOCAL_BUNDLED is not set
    5.21  # CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
    5.22  # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
    5.23 -CT_PATCH_ORDER="local"
    5.24 +CT_PATCH_NONE=y
    5.25 +CT_PATCH_ORDER="none"
    5.26  # CT_PATCH_SINGLE is not set
    5.27 -CT_PATCH_USE_LOCAL=y
    5.28 -CT_LOCAL_PATCH_DIR=""
    5.29 +# CT_PATCH_USE_LOCAL is not set
    5.30  
    5.31  #
    5.32  # Build behavior
    5.33 @@ -92,8 +92,8 @@
    5.34  # CT_ARCH_SUPPORT_CPU is not set
    5.35  # CT_ARCH_SUPPORT_TUNE is not set
    5.36  CT_ARCH_SUPPORT_FPU=y
    5.37 -CT_ARCH_DEFAULT_HAS_MMU=y
    5.38 -CT_ARCH_DEFAULT_BE=y
    5.39 +# CT_ARCH_DEFAULT_HAS_MMU is not set
    5.40 +# CT_ARCH_DEFAULT_BE is not set
    5.41  # CT_ARCH_DEFAULT_LE is not set
    5.42  CT_ARCH_FPU=""
    5.43  CT_ARCH_FLOAT_HW=y
    5.44 @@ -109,13 +109,13 @@
    5.45  # CT_ARCH_avr32 is not set
    5.46  # CT_ARCH_ia64 is not set
    5.47  # CT_ARCH_mips is not set
    5.48 +# CT_ARCH_powerpc is not set
    5.49  # CT_ARCH_powerpc64 is not set
    5.50 -# CT_ARCH_powerpc is not set
    5.51  # CT_ARCH_s390 is not set
    5.52  CT_ARCH_s390x=y
    5.53  # CT_ARCH_sh is not set
    5.54 +# CT_ARCH_x86 is not set
    5.55  # CT_ARCH_x86_64 is not set
    5.56 -# CT_ARCH_x86 is not set
    5.57  CT_ARCH_USE_MMU=y
    5.58  
    5.59  #
    5.60 @@ -278,6 +278,7 @@
    5.61  # CT_LIBC_newlib is not set
    5.62  # CT_LIBC_none is not set
    5.63  # CT_LIBC_uClibc is not set
    5.64 +# CT_LIBC_V_2_10_1 is not set
    5.65  CT_LIBC_V_2_9=y
    5.66  # CT_LIBC_V_2_8 is not set
    5.67  # CT_LIBC_V_2_7 is not set
     6.1 --- a/samples/s390x-ibm-linux-gnu/reported.by	Mon Nov 16 20:15:45 2009 +0100
     6.2 +++ b/samples/s390x-ibm-linux-gnu/reported.by	Mon Nov 16 20:18:09 2009 +0100
     6.3 @@ -1,3 +1,3 @@
     6.4  reporter_name="Harold Grovesteen"
     6.5 -reporter_url=""
     6.6 +reporter_url="http://sourceware.org/ml/crossgcc/2009-11/msg00052.html"
     6.7  reporter_comment=""
     7.1 --- a/scripts/build/arch/s390.sh	Mon Nov 16 20:15:45 2009 +0100
     7.2 +++ b/scripts/build/arch/s390.sh	Mon Nov 16 20:18:09 2009 +0100
     7.3 @@ -1,9 +1,6 @@
     7.4  # Compute s390-specific values
     7.5  
     7.6  CT_DoArchTupleValues() {
     7.7 -    # The architecture part of the tuple:
     7.8 -    # Explicit settings not required for the default value "s390"
     7.9 -    #CT_TARGET_ARCH="s390"
    7.10 -    #CT_KERNEL_ARCH="s390"
    7.11 -    return 0
    7.12 +    # Defaults are all OK for s390
    7.13 +    :
    7.14  }
     8.1 --- a/scripts/build/arch/s390x.sh	Mon Nov 16 20:15:45 2009 +0100
     8.2 +++ b/scripts/build/arch/s390x.sh	Mon Nov 16 20:18:09 2009 +0100
     8.3 @@ -1,8 +1,6 @@
     8.4  # Compute s390x-specific values
     8.5  
     8.6  CT_DoArchTupleValues() {
     8.7 -    # The architecture part of the tuple:
     8.8 -    # Explicit settings not required for the default value "s390x"
     8.9 -    #CT_TARGET_ARCH="s390x"
    8.10 +    # The kernel architecture is the same name as for the 32-bit version:
    8.11      CT_KERNEL_ARCH="s390"
    8.12  }