# HG changeset patch # User "Yann E. MORIN" # Date 1258399089 -3600 # Node ID 14abcd185e4b59386b3dabeeb84294487bda4c7d # Parent 1409ba438ea1314f61b4761939cb971c8ecf1393 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. diff -r 1409ba438ea1 -r 14abcd185e4b config/arch/s390.in --- a/config/arch/s390.in Mon Nov 16 20:15:45 2009 +0100 +++ b/config/arch/s390.in Mon Nov 16 20:18:09 2009 +0100 @@ -4,9 +4,6 @@ config ARCH_s390 select ARCH_USE_MMU select ARCH_SUPPORT_FPU - select ARCH_DEFAULT_HAS_MMU - select ARCH_DEFAULT_BE - select CT_THREAD help The IBM ESA/390 architecture, as defined by: http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS diff -r 1409ba438ea1 -r 14abcd185e4b config/arch/s390x.in --- a/config/arch/s390x.in Mon Nov 16 20:15:45 2009 +0100 +++ b/config/arch/s390x.in Mon Nov 16 20:18:09 2009 +0100 @@ -5,9 +5,6 @@ select ARCH_64 select ARCH_USE_MMU select ARCH_SUPPORT_FPU - select ARCH_DEFAULT_HAS_MMU - select ARCH_DEFAULT_BE - select CT_THREAD help The IBM z/Architecture, as defined by: http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS diff -r 1409ba438ea1 -r 14abcd185e4b samples/s390-ibm-linux-gnu/crosstool.config --- a/samples/s390-ibm-linux-gnu/crosstool.config Mon Nov 16 20:15:45 2009 +0100 +++ b/samples/s390-ibm-linux-gnu/crosstool.config Mon Nov 16 20:18:09 2009 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# crosstool-NG version: hg_default@1620_187e06178dcb -# Sat Nov 14 08:15:54 2009 +# crosstool-NG version: hg_default@1629_f67c0106cefc +# Mon Nov 16 20:16:20 2009 # # @@ -42,15 +42,15 @@ CT_OVERIDE_CONFIG_GUESS_SUB=y # CT_ONLY_EXTRACT is not set # CT_PATCH_BUNDLED is not set -CT_PATCH_LOCAL=y +# CT_PATCH_LOCAL is not set # CT_PATCH_BUNDLED_LOCAL is not set # 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_ORDER="local" +CT_PATCH_NONE=y +CT_PATCH_ORDER="none" # CT_PATCH_SINGLE is not set -CT_PATCH_USE_LOCAL=y -CT_LOCAL_PATCH_DIR="" +# CT_PATCH_USE_LOCAL is not set # # Build behavior @@ -92,8 +92,8 @@ # CT_ARCH_SUPPORT_CPU is not set # CT_ARCH_SUPPORT_TUNE is not set CT_ARCH_SUPPORT_FPU=y -CT_ARCH_DEFAULT_HAS_MMU=y -CT_ARCH_DEFAULT_BE=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_FPU="" CT_ARCH_FLOAT_HW=y @@ -109,13 +109,13 @@ # 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 is not set -# CT_ARCH_powerpc is not set CT_ARCH_s390=y # 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 -# CT_ARCH_x86 is not set CT_ARCH_USE_MMU=y # @@ -278,6 +278,7 @@ # 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 diff -r 1409ba438ea1 -r 14abcd185e4b samples/s390-ibm-linux-gnu/reported.by --- a/samples/s390-ibm-linux-gnu/reported.by Mon Nov 16 20:15:45 2009 +0100 +++ b/samples/s390-ibm-linux-gnu/reported.by Mon Nov 16 20:18:09 2009 +0100 @@ -1,3 +1,3 @@ reporter_name="Harold Grovesteen" -reporter_url="" +reporter_url="http://sourceware.org/ml/crossgcc/2009-11/msg00052.html" reporter_comment="" diff -r 1409ba438ea1 -r 14abcd185e4b samples/s390x-ibm-linux-gnu/crosstool.config --- a/samples/s390x-ibm-linux-gnu/crosstool.config Mon Nov 16 20:15:45 2009 +0100 +++ b/samples/s390x-ibm-linux-gnu/crosstool.config Mon Nov 16 20:18:09 2009 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# crosstool-NG version: hg_default@1620_187e06178dcb -# Sat Nov 14 09:39:36 2009 +# crosstool-NG version: hg_default@1629_f67c0106cefc +# Mon Nov 16 20:16:32 2009 # # @@ -42,15 +42,15 @@ CT_OVERIDE_CONFIG_GUESS_SUB=y # CT_ONLY_EXTRACT is not set # CT_PATCH_BUNDLED is not set -CT_PATCH_LOCAL=y +# CT_PATCH_LOCAL is not set # CT_PATCH_BUNDLED_LOCAL is not set # 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_ORDER="local" +CT_PATCH_NONE=y +CT_PATCH_ORDER="none" # CT_PATCH_SINGLE is not set -CT_PATCH_USE_LOCAL=y -CT_LOCAL_PATCH_DIR="" +# CT_PATCH_USE_LOCAL is not set # # Build behavior @@ -92,8 +92,8 @@ # CT_ARCH_SUPPORT_CPU is not set # CT_ARCH_SUPPORT_TUNE is not set CT_ARCH_SUPPORT_FPU=y -CT_ARCH_DEFAULT_HAS_MMU=y -CT_ARCH_DEFAULT_BE=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_FPU="" CT_ARCH_FLOAT_HW=y @@ -109,13 +109,13 @@ # 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 is not set -# CT_ARCH_powerpc is not set # CT_ARCH_s390 is not set CT_ARCH_s390x=y # CT_ARCH_sh is not set +# CT_ARCH_x86 is not set # CT_ARCH_x86_64 is not set -# CT_ARCH_x86 is not set CT_ARCH_USE_MMU=y # @@ -278,6 +278,7 @@ # 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 diff -r 1409ba438ea1 -r 14abcd185e4b samples/s390x-ibm-linux-gnu/reported.by --- a/samples/s390x-ibm-linux-gnu/reported.by Mon Nov 16 20:15:45 2009 +0100 +++ b/samples/s390x-ibm-linux-gnu/reported.by Mon Nov 16 20:18:09 2009 +0100 @@ -1,3 +1,3 @@ reporter_name="Harold Grovesteen" -reporter_url="" +reporter_url="http://sourceware.org/ml/crossgcc/2009-11/msg00052.html" reporter_comment="" diff -r 1409ba438ea1 -r 14abcd185e4b scripts/build/arch/s390.sh --- a/scripts/build/arch/s390.sh Mon Nov 16 20:15:45 2009 +0100 +++ b/scripts/build/arch/s390.sh Mon Nov 16 20:18:09 2009 +0100 @@ -1,9 +1,6 @@ # Compute s390-specific values CT_DoArchTupleValues() { - # The architecture part of the tuple: - # Explicit settings not required for the default value "s390" - #CT_TARGET_ARCH="s390" - #CT_KERNEL_ARCH="s390" - return 0 + # Defaults are all OK for s390 + : } diff -r 1409ba438ea1 -r 14abcd185e4b scripts/build/arch/s390x.sh --- a/scripts/build/arch/s390x.sh Mon Nov 16 20:15:45 2009 +0100 +++ b/scripts/build/arch/s390x.sh Mon Nov 16 20:18:09 2009 +0100 @@ -1,8 +1,6 @@ # Compute s390x-specific values CT_DoArchTupleValues() { - # The architecture part of the tuple: - # Explicit settings not required for the default value "s390x" - #CT_TARGET_ARCH="s390x" + # The kernel architecture is the same name as for the 32-bit version: CT_KERNEL_ARCH="s390" }