Index: build/make/configure.sh
===================================================================
--- build/make/configure.sh.orig
+++ build/make/configure.sh
@@ -614,6 +614,12 @@ process_common_toolchain() {
             *powerpc*)
                 tgt_isa=ppc32
                 ;;
+            *s390x*)
+                tgt_isa=s390x
+                ;;
+            *s390*)
+                tgt_isa=s390
+                ;;
             *sparc*)
                 tgt_isa=sparc
                 ;;
Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -104,6 +104,8 @@ all_platforms="${all_platforms} ppc32-li
 all_platforms="${all_platforms} ppc64-darwin8-gcc"
 all_platforms="${all_platforms} ppc64-darwin9-gcc"
 all_platforms="${all_platforms} ppc64-linux-gcc"
+all_platforms="${all_platforms} s390-linux-gcc"
+all_platforms="${all_platforms} s390x-linux-gcc"
 all_platforms="${all_platforms} sparc-solaris-gcc"
 all_platforms="${all_platforms} x86-darwin8-gcc"
 all_platforms="${all_platforms} x86-darwin8-icc"