Merge remote-tracking branch 'upstream/master'

1 files changed, 27 insertions, 0 deletions

diff --git a/scripts/build/arch/s390.sh b/scripts/build/arch/s390.sh
index b4b8078..e303420 100644
--- a/scripts/build/arch/s390.sh
+++ b/scripts/build/arch/s390.sh
@@ -6,3 +6,30 @@ CT_DoArchTupleValues() {
         CT_TARGET_ARCH="s390x${CT_ARCH_SUFFIX}"
     fi
 }
+
+#------------------------------------------------------------------------------
+# Get multilib architecture-specific target
+# Usage: CT_DoArchMultilibTarget "multilib flags" "target tuple"
+CT_DoArchMultilibTarget ()
+{
+    local target="${1}"; shift
+    local -a multi_flags=( "$@" )
+
+    local m31=false
+    local m64=false
+
+    for m in "${multi_flags[@]}"; do
+        case "${multi_flags}" in
+            -m64) m64=true ;;
+            -m31) m31=true ;;
+        esac
+    done
+
+    # Fix bitness
+    case "${target}" in
+        s390-*)   $m64 && target=${target/#s390-/s390x-} ;;
+        s390x-*)  $m31 && target=${target/#s390x-/s390-} ;;
+    esac
+
+    echo "${target}"
+}