Bug 1255305 - Uniformize CPU_ARCH between old-configure.in and js/src/old-configure.in draft
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 11 Mar 2016 22:35:12 +0900
changeset 339511 9e6332fab3de3a08aa65429be9e33c41e7934eb6
parent 339510 1b573d0c9efcbeebe87053182b667fb955cd58db
child 339512 fd508a5095bf67e57cc314695765a7a6130e2104
push id12749
push userbmo:mh+mozilla@glandium.org
push dateFri, 11 Mar 2016 15:49:26 +0000
bugs1255305
milestone48.0a1
Bug 1255305 - Uniformize CPU_ARCH between old-configure.in and js/src/old-configure.in
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
@@ -1065,19 +1065,24 @@ 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
 fi
@@ -5885,17 +5890,17 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
     LIBJPEG_TURBO_ASFLAGS="-f win64 -rnasm -pnasm -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="-f elf32 -rnasm -pnasm -DPIC -DELF"
     fi
   ;;
   *:x86_64)