Bug 1255305 - Uniformize CPU_ARCH between old-configure.in and js/src/old-configure.in. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 11 Mar 2016 22:35:12 +0900
changeset 288649 0f34a2f4714e35f077029bd7883fdc3dd38af9a8
parent 288648 7b559b11d4d1a07ba987fe5a2ec7b036a73185ef
child 288650 fc98436187af3e5b75fadfd1acd31fbcce9cd839
push id18174
push usercbook@mozilla.com
push dateTue, 15 Mar 2016 09:44:58 +0000
treeherderfx-team@dd0baa33759d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1255305
milestone48.0a1
Bug 1255305 - Uniformize CPU_ARCH between old-configure.in and js/src/old-configure.in. r=chmanchester
build/autoconf/android.m4
old-configure.in
--- a/build/autoconf/android.m4
+++ b/build/autoconf/android.m4
@@ -198,17 +198,17 @@ if test "$OS_TARGET" = "Android" -a -z "
         ANDROID_CPU_ARCH=armeabi-v7a
         ;;
     arm-*)
         ANDROID_CPU_ARCH=armeabi
         ;;
     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
 
     AC_SUBST(ANDROID_CPU_ARCH)
 fi
 ])
 
--- a/old-configure.in
+++ b/old-configure.in
@@ -1064,18 +1064,23 @@ x86_64 | ia64)
     CPU_ARCH="$OS_TEST"
     ;;
 
 arm*)
     CPU_ARCH=arm
     ;;
 
 mips|mipsel)
-    CPU_ARCH="mips"
-    ;;
+    CPU_ARCH="mips32"
+    ;;
+
+mips64|mips64el)
+    CPU_ARCH="mips64"
+    ;;
+
 
 aarch64*)
     CPU_ARCH=aarch64
     ;;
 esac
 
 if test -z "$OS_TARGET"; then
     OS_TARGET=$OS_ARCH
@@ -5918,17 +5923,17 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
     LIBJPEG_TURBO_ASFLAGS="-D__x86_64__ -DPIC -DWIN64 -DMSVC"
   ;;
   *:arm)
     LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
   ;;
   *:aarch64)
     LIBJPEG_TURBO_ASFLAGS="-march=armv8-a"
   ;;
-  *:mips)
+  *:mips32)
     LIBJPEG_TURBO_ASFLAGS="-mdspr2"
   ;;
   *:x86)
     if $CC -E -dM -</dev/null | grep -q __ELF__; then
       LIBJPEG_TURBO_ASFLAGS="-DPIC -DELF"
     fi
   ;;
   *:x86_64)