Bug 1014375 - Properly define JS_PUNBOX64 or JS_NUNBOX32 depending on the CPU arch r=nbp a=lmandel
authorLandry Breuil <landry@openbsd.org>
Wed, 10 Sep 2014 21:53:25 +0200
changeset 216693 31a06334affd
parent 216692 320e081cac62
child 216694 f89c8ca38b12
push id3880
push userlandry@openbsd.org
push date2014-09-10 19:55 +0000
treeherdermozilla-beta@31a06334affd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp, lmandel
bugs1014375
milestone33.0
Bug 1014375 - Properly define JS_PUNBOX64 or JS_NUNBOX32 depending on the CPU arch r=nbp a=lmandel
js/src/configure.in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1978,49 +1978,43 @@ if test -z "$COMPILE_ENVIRONMENT"; then
 fi
 
 dnl Configure JIT support
 
 case "$target" in
 i?86-*)
     ENABLE_ION=1
     AC_DEFINE(JS_CPU_X86)
-    AC_DEFINE(JS_NUNBOX32)
     ;;
 x86_64*-*)
     ENABLE_ION=1
     AC_DEFINE(JS_CPU_X64)
-    AC_DEFINE(JS_PUNBOX64)
     ;;
 arm*-*)
     ENABLE_ION=1
     AC_DEFINE(JS_CPU_ARM)
-    AC_DEFINE(JS_NUNBOX32)
     ;;
-sparc*-*)
-    if test ! "$HAVE_64BIT_BUILD" ; then
+sparc-*)
 dnl ENABLE_ION=0
     AC_DEFINE(JS_CPU_SPARC)
-    AC_DEFINE(JS_NUNBOX32)
-    else
-    AC_DEFINE(JS_CPU_SPARC64)
-    AC_DEFINE(JS_PUNBOX64)
-    fi
-    ;;
-powerpc64-*)
-    AC_DEFINE(JS_CPU_PPC64)
-    AC_DEFINE(JS_PUNBOX64)
-    ;;
-powerpc-*)
-    AC_DEFINE(JS_CPU_PPC)
-    AC_DEFINE(JS_NUNBOX32)
-    ;;
 mips*-*)
     AC_DEFINE(JS_CPU_MIPS)
-    AC_DEFINE(JS_NUNBOX32)
+    ;;
+esac
+
+case "$target" in
+mips*-*)
+     AC_DEFINE(JS_NUNBOX32)
+     ;;
+*)
+    if test "$HAVE_64BIT_BUILD" ; then
+        AC_DEFINE(JS_PUNBOX64)
+    else
+        AC_DEFINE(JS_NUNBOX32)
+    fi
     ;;
 esac
 
 MOZ_ARG_DISABLE_BOOL(ion,
 [  --disable-ion      Disable use of the IonMonkey JIT],
   ENABLE_ION= )
 
 AC_SUBST(ENABLE_METHODJIT_SPEW)