diff --git a/build/make/configure.sh b/build/make/configure.sh
index 00214c9d2..4001d6497 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -754,6 +754,15 @@ process_common_toolchain() {
       *i[3456]86*)
         tgt_isa=x86
         ;;
+      s390x*)
+        tgt_isa=s390x
+        ;;
+      s390*)
+        tgt_isa=s390
+        ;;
+      riscv64*)
+        tgt_isa=riscv64
+        ;;
       *sparc*)
         tgt_isa=sparc
         ;;
diff --git a/configure b/configure
index 6204f10b6..54ff8862b 100755
--- a/configure
+++ b/configure
@@ -116,6 +116,9 @@ all_platforms="${all_platforms} armv8-linux-gcc"
 all_platforms="${all_platforms} mips32-linux-gcc"
 all_platforms="${all_platforms} mips64-linux-gcc"
 all_platforms="${all_platforms} ppc64le-linux-gcc"
+all_platforms="${all_platforms} s390-linux-gcc"
+all_platforms="${all_platforms} s390x-linux-gcc"
+all_platforms="${all_platforms} riscv64-linux-gcc"
 all_platforms="${all_platforms} sparc-solaris-gcc"
 all_platforms="${all_platforms} x86-android-gcc"
 all_platforms="${all_platforms} x86-darwin8-gcc"