From a768dba8e16c49e93917dc8407d3f656aab4beac Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 11 Mar 2016 22:35:12 +0900
Subject: [PATCH] Bug 1255305 - Uniformize CPU_ARCH between old-configure.in
 and js/src/old-configure.in. r=chmanchester

---
 build/autoconf/android.m4 | 2 +-
 old-configure.in          | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
index 00f8fcca904d..b05a2552dad7 100644
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -203,7 +203,7 @@ if test "$OS_TARGET" = "Android" -a -z "$gonkdir"; then
     x86-*)
         ANDROID_CPU_ARCH=x86
         ;;
-    mips-*) # When target_cpu is mipsel, CPU_ARCH is mips
+    mips32-*) # When target_cpu is mipsel, CPU_ARCH is mips32
         ANDROID_CPU_ARCH=mips
         ;;
     esac
diff --git a/old-configure.in b/old-configure.in
index 5bdee2ef9c0b..f887f833f268 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1069,9 +1069,14 @@ arm*)
     ;;
 
 mips|mipsel)
-    CPU_ARCH="mips"
+    CPU_ARCH="mips32"
     ;;
 
+mips64|mips64el)
+    CPU_ARCH="mips64"
+    ;;
+
+
 aarch64*)
     CPU_ARCH=aarch64
     ;;
@@ -5923,7 +5928,7 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
   *:aarch64)
     LIBJPEG_TURBO_ASFLAGS="-march=armv8-a"
   ;;
-  *:mips)
+  *:mips32)
     LIBJPEG_TURBO_ASFLAGS="-mdspr2"
   ;;
   *:x86)