summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-11-17 10:54:44 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-11-17 10:54:44 (GMT)
commitcb52ec6051c120a64fc79170d82c7e08d367f88a (patch)
tree20dffcb6fbab1bf3a03cea64a05333615a5affaa /scripts/build
parent7ea82181db30cd437967e7bca1177f8cbd2f6fc5 (diff)
arch/s390: commonalise the 32- and 64-bit s390 arch
Diffstat (limited to 'scripts/build')
-rw-r--r--scripts/build/arch/s390.sh6
-rw-r--r--scripts/build/arch/s390x.sh6
2 files changed, 4 insertions, 8 deletions
diff --git a/scripts/build/arch/s390.sh b/scripts/build/arch/s390.sh
index 4ffcf25..3c865e3 100644
--- a/scripts/build/arch/s390.sh
+++ b/scripts/build/arch/s390.sh
@@ -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
}
diff --git a/scripts/build/arch/s390x.sh b/scripts/build/arch/s390x.sh
deleted file mode 100644
index ef052d6..0000000
--- a/scripts/build/arch/s390x.sh
+++ /dev/null
@@ -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"
-}