Bug 1014375 - Properly define JS_PUNBOX64 or JS_NUNBOX32 depending on the CPU arch r=nbp
authorLandry Breuil <landry@openbsd.org>
Mon, 01 Sep 2014 21:41:53 +0200
changeset 224506 926f47807112ccfdbd8ae65a96c0a49cc6ff75b9
parent 224505 b6832df4a1c12c6c8a301397a18aa9cc886e27a1
child 224507 a7b832e15a3400f04ee2fe047936eec6cda1d4a2
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnbp
bugs1014375
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1014375 - Properly define JS_PUNBOX64 or JS_NUNBOX32 depending on the CPU arch r=nbp
js/src/configure.in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1996,53 +1996,47 @@ 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*-*)
     ENABLE_ION=1
     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
+    ;;
+
 MOZ_ARG_DISABLE_BOOL(ion,
 [  --disable-ion      Disable use of the IonMonkey JIT],
   ENABLE_ION= )
 
 AC_SUBST(ENABLE_METHODJIT_SPEW)
 
 AC_SUBST(ENABLE_ION)