arch/s390: commonalise the 32- and 64-bit s390 arch

This commit is contained in:
Yann E. MORIN" 2009-11-17 11:54:44 +01:00
parent 7ea82181db
commit cb52ec6051
6 changed files with 34 additions and 32 deletions

View File

@ -2,8 +2,12 @@
# depends on EXPERIMENTAL
config ARCH_s390
select ARCH_SUPPORTS_32
select ARCH_SUPPORTS_64
select ARCH_DEFAULT_32
select ARCH_USE_MMU
select ARCH_SUPPORT_FPU
help
The IBM ESA/390 architecture, as defined by:
http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
Defined by IBM in:
32-bit ESA/390 : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
64-bit z/Architecure : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS

View File

@ -1,10 +0,0 @@
# s390x specific config options
# depends on EXPERIMENTAL
config ARCH_s390x
select ARCH_64
select ARCH_USE_MMU
select ARCH_SUPPORT_FPU
help
The IBM z/Architecture, as defined by:
http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# crosstool-NG version: hg_default@1629_f67c0106cefc
# Mon Nov 16 20:16:20 2009
# crosstool-NG version: hg_default@1636_2ed5947c896a
# Tue Nov 17 11:53:01 2009
#
#
@ -87,6 +87,8 @@ CT_ARCH="s390"
# 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 is not set
# CT_ARCH_SUPPORT_CPU is not set
@ -95,7 +97,11 @@ CT_ARCH_SUPPORT_FPU=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_FPU=""
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=""
@ -110,12 +116,9 @@ CT_TARGET_LDFLAGS=""
# 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_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_USE_MMU=y
#

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# crosstool-NG version: hg_default@1629_f67c0106cefc
# Mon Nov 16 20:16:32 2009
# crosstool-NG version: hg_default@1636_2ed5947c896a
# Tue Nov 17 11:54:19 2009
#
#
@ -83,10 +83,12 @@ CT_LOG_FILE_COMPRESS=y
#
# Target options
#
CT_ARCH="s390x"
CT_ARCH="s390"
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 is not set
# CT_ARCH_SUPPORT_CPU is not set
@ -95,7 +97,11 @@ CT_ARCH_SUPPORT_FPU=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_FPU=""
# 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=""
@ -110,12 +116,15 @@ CT_TARGET_LDFLAGS=""
# 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_s390 is not set
CT_ARCH_s390x=y
CT_ARCH_s390=y
# CT_ARCH_sh is not set
# CT_ARCH_x86 is not set
# CT_ARCH_x86_64 is not set
# CT_ARCH_ALPHA_EV4 is not set
# CT_ARCH_ALPHA_EV45 is not set
# CT_ARCH_ALPHA_EV5 is not set
# CT_ARCH_ALPHA_EV56 is not set
# CT_ARCH_ALPHA_EV6 is not set
# CT_ARCH_ALPHA_EV67 is not set
CT_ARCH_USE_MMU=y
#

View File

@ -1,6 +1,8 @@
# Compute s390-specific values
CT_DoArchTupleValues() {
# Defaults are all OK for s390
:
# That's the only thing to override
if [ "${CT_ARCH_64}" = "y" ]; then
CT_TARGET_ARCH="s390x"
fi
}

View File

@ -1,6 +0,0 @@
# Compute s390x-specific values
CT_DoArchTupleValues() {
# The kernel architecture is the same name as for the 32-bit version:
CT_KERNEL_ARCH="s390"
}