Bug 1421687 - move JS_*UNBOX* definitions to moz.configure; r=nalexander
authorNathan Froyd <froydnj@mozilla.com>
Fri, 01 Dec 2017 21:29:28 -0500
changeset 394588 1536601cf41631517d888231300672c6988fe5ba
parent 394587 f848a44b286828352803a24db3688f3455fc5b81
child 394589 08fb3c18e98dabddbc9d982e5ee47ee128f71a3c
push id33011
push usernerli@mozilla.com
push dateSat, 02 Dec 2017 21:41:32 +0000
treeherdermozilla-central@de1f7a92e872 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1421687
milestone59.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 1421687 - move JS_*UNBOX* definitions to moz.configure; r=nalexander
js/moz.configure
js/src/old-configure.in
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -31,16 +31,20 @@ js_option('--disable-js-shell', default=
 @depends('--disable-js-shell')
 def js_disable_shell(value):
     if not value:
         return True
 
 set_config('JS_DISABLE_SHELL', js_disable_shell)
 
 
+set_define('JS_PUNBOX64', depends(target)(lambda t: t.bitness == 64 or None))
+set_define('JS_NUNBOX32', depends(target)(lambda t: t.bitness == 32 or None))
+
+
 # SpiderMonkey as a shared library, and how its symbols are exported
 # ==================================================================
 js_option('--disable-shared-js', default=building_js,
           help='Do not create a shared library')
 
 js_option('--disable-export-js', default=building_js,
           help='Do not mark JS symbols as DLL exported/visible')
 
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -895,22 +895,16 @@ fi
 dnl Configure JIT support
 
 case "$CPU_ARCH" in
 x86|x86_64|arm|aarch64|mips*)
     ENABLE_ION=1
     ;;
 esac
 
-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_ION)
 
 if test -n "$COMPILE_ENVIRONMENT"; then
     MOZ_COMPILER_OPTS