From cb52ec6051c120a64fc79170d82c7e08d367f88a Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Tue, 17 Nov 2009 11:54:44 +0100
Subject: arch/s390: commonalise the 32- and 64-bit s390 arch

---
 scripts/build/arch/s390.sh  | 6 ++++--
 scripts/build/arch/s390x.sh | 6 ------
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 scripts/build/arch/s390x.sh

(limited to 'scripts/build/arch')

diff --git a/scripts/build/arch/s390.sh b/scripts/build/arch/s390.sh
index 4ffcf251..3c865e31 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 ef052d66..00000000
--- 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"
-}
-- 
cgit v1.2.3