Bug 890171 - Cleanup old jaegermonkey defines in js/sc/configure. r=luke
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Tue, 09 Jul 2013 14:30:11 +0900
changeset 137709 47c7ad925a5962ca70bb0fd681ea3f45180f47dc
parent 137708 76fd9ae48f17403125f7f971f11de5b63c5e70b6
child 137710 0ed80fcff168df1c768878393e2f3ca3a18449cc
push id30662
push userm_kato@ga2.so-net.ne.jp
push dateTue, 09 Jul 2013 05:31:13 +0000
treeherdermozilla-inbound@47c7ad925a59 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs890171
milestone25.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 890171 - Cleanup old jaegermonkey defines in js/sc/configure. r=luke
js/src/Makefile.in
js/src/configure.in
js/src/ion/Registers.h
js/src/js-config.h.in
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -329,20 +329,17 @@ check-jstests:
 # Rather than risking regressions in major configurations while fixing these
 # secondary configuration, we work around them and fix the bugs later.
 #
 #   Bug 652154: On Windows, SM(!m !t) don't work because of path problems with
 #				their unusual directory layout
 #
 #   Bug 652155: On Mac, SM(d) doesn't work for unknown reasons
 
-ifeq ($(OS_ARCH),WINNT)
-ifdef ENABLE_METHODJIT
-endif
-else
+ifneq ($(OS_ARCH),WINNT)
 ifndef HAVE_DTRACE
 #check:: check-jstests
 endif
 endif
 
 DIST_GARBAGE = config.cache config.log config.status* \
    config/autoconf.mk \
    unallmakefiles $(JS_CONFIG_NAME) js-config.h js-confdefs.h
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2062,97 +2062,58 @@ if test -z "$COMPILE_ENVIRONMENT"; then
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
 fi
 
 dnl Configure JIT support
 
 case "$target" in
 i?86-*)
-    ENABLE_METHODJIT=1
     ENABLE_ION=1
-    ENABLE_MONOIC=1
-    ENABLE_POLYIC=1
-    ENABLE_METHODJIT_TYPED_ARRAY=1
     ENABLE_YARR_JIT=1
     AC_DEFINE(JS_CPU_X86)
     AC_DEFINE(JS_NUNBOX32)
     ;;
 x86_64*-*)
-    ENABLE_METHODJIT=1
     ENABLE_ION=1
-    ENABLE_MONOIC=1
-    ENABLE_POLYIC=1
-    ENABLE_METHODJIT_TYPED_ARRAY=1
     ENABLE_YARR_JIT=1
     AC_DEFINE(JS_CPU_X64)
     AC_DEFINE(JS_PUNBOX64)
     ;;
 arm*-*)
-    ENABLE_METHODJIT=1
     ENABLE_ION=1
-    ENABLE_MONOIC=1
-    ENABLE_POLYIC=1
-    ENABLE_METHODJIT_TYPED_ARRAY=1
     ENABLE_YARR_JIT=1
     AC_DEFINE(JS_CPU_ARM)
     AC_DEFINE(JS_NUNBOX32)
     ;;
 sparc*-*)
     if test ! "$HAVE_64BIT_OS" ; then
-    ENABLE_METHODJIT=1
-    ENABLE_MONOIC=1
-    ENABLE_POLYIC=1
-    ENABLE_METHODJIT_TYPED_ARRAY=1
     ENABLE_YARR_JIT=1
 dnl ENABLE_ION=0
     AC_DEFINE(JS_CPU_SPARC)
     AC_DEFINE(JS_NUNBOX32)
     fi
     ;;
 mips*-*)
-    ENABLE_METHODJIT=1
-    ENABLE_MONOIC=1
-    ENABLE_POLYIC=1
-    ENABLE_METHODJIT_TYPED_ARRAY=1
     ENABLE_YARR_JIT=1
     AC_DEFINE(JS_CPU_MIPS)
     AC_DEFINE(JS_NUNBOX32)
     ;;
 esac
 
 MOZ_ARG_DISABLE_BOOL(ion,
 [  --disable-ion      Disable use of the IonMonkey JIT],
   ENABLE_ION= )
 
 MOZ_ARG_DISABLE_BOOL(yarr-jit,
 [  --disable-yarr-jit    Disable YARR JIT support],
   ENABLE_YARR_JIT= )
 
-AC_SUBST(ENABLE_METHODJIT)
 AC_SUBST(ENABLE_METHODJIT_SPEW)
 
-if test "$ENABLE_METHODJIT"; then
-    AC_DEFINE(JS_METHODJIT)
-else
-    ENABLE_ION=
-fi
-
-if test "$ENABLE_MONOIC"; then
-    AC_DEFINE(JS_MONOIC)
-fi
-
-if test "$ENABLE_POLYIC"; then
-    AC_DEFINE(JS_POLYIC)
-fi
-
-if test "$ENABLE_METHODJIT_TYPED_ARRAY"; then
-    AC_DEFINE(JS_METHODJIT_TYPED_ARRAY)
-fi
-
 AC_SUBST(ENABLE_ION)
 
 if test "$ENABLE_ION"; then
     AC_DEFINE(JS_ION)
 fi
 
 AC_SUBST(ENABLE_YARR_JIT)
 
@@ -3273,17 +3234,17 @@ if test -z "$MOZ_DEBUG_FLAGS"; then
   MOZ_DEBUG_FLAGS="-g"
 fi
 
 MOZ_ARG_ENABLE_STRING(debug,
 [  --enable-debug[=DBG]    Enable building with developer debug info
                            (using compiler flags DBG)],
 [ if test "$enableval" != "no"; then
     MOZ_DEBUG=1
-    if test "$ENABLE_METHODJIT" -o "$ENABLE_YARR_JIT"; then
+    if test "$ENABLE_YARR_JIT"; then
          # needs MethodJIT or YarrJIT
          ENABLE_METHODJIT_SPEW=1
     fi
     if test -n "$enableval" -a "$enableval" != "yes"; then
         MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
         _MOZ_DEBUG_FLAGS_SET=1
     fi
   else
--- a/js/src/ion/Registers.h
+++ b/js/src/ion/Registers.h
@@ -14,17 +14,17 @@
 #elif defined(JS_CPU_X64)
 # include "ion/x64/Architecture-x64.h"
 #elif defined(JS_CPU_ARM)
 # include "ion/arm/Architecture-arm.h"
 #endif
 #include "ion/FixedArityList.h"
 
 // ARM defines the RegisterID within Architecture-arm.h
-#if !defined(JS_CPU_ARM) && defined(JS_METHODJIT)
+#if !defined(JS_CPU_ARM)
 #include "assembler/assembler/MacroAssembler.h"
 #endif
 
 namespace js {
 namespace ion {
 
 struct Register {
     typedef Registers Codes;
--- a/js/src/js-config.h.in
+++ b/js/src/js-config.h.in
@@ -33,17 +33,13 @@
 /* Define to 1 if the <sys/isa_defs.h> header is present and
    useable.  See jscpucfg.h.  */
 #undef JS_HAVE_SYS_ISA_DEFS_H
 
 /* The configure script defines these if it doesn't #define
    JS_HAVE_STDINT_H.  */
 #undef JS_BYTES_PER_WORD
 
-/* Some mozilla code uses JS-friend APIs that depend on JS_METHODJIT being
-   correct. */
-#undef JS_METHODJIT
-
 /* MOZILLA JSAPI version number components */
 #undef MOZJS_MAJOR_VERSION
 #undef MOZJS_MINOR_VERSION
 
 #endif /* js_config_h___ */