Changed --enable-jit to --enable-tracejit (bug 545245, r=sayrer).

js/src/Makefile.in

@@ -224,7 +224,7 @@ INSTALLED_HEADERS = \
 		jsxml.h \
 		$(NULL)
 
-ifdef ENABLE_JIT
+ifdef ENABLE_TRACEJIT
 VPATH		+= $(srcdir)/nanojit
 
 INSTALLED_HEADERS += \
@@ -265,7 +265,7 @@ ASFLAGS += -arch 6
 ASFILES += jswince.asm
 endif
 
-endif # ENABLE_JIT
+endif # ENABLE_TRACEJIT
 
 ifdef HAVE_DTRACE
 INSTALLED_HEADERS += \
@@ -361,7 +361,7 @@ check-valgrind::
 	$(check-sync-dirs) $(srcdir)/build $(MOZ_SYNC_BUILD_FILES)/build
 endif
 
-ifdef ENABLE_JIT
+ifdef ENABLE_TRACEJIT
 check::
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/trace-test/trace-test.py \
 	        --no-slow --no-progress --tinderbox $(DIST)/bin/js$(BIN_SUFFIX)

js/src/config/autoconf.mk.in

@@ -341,6 +341,6 @@ HAVE_DTRACE= @HAVE_DTRACE@
 VISIBILITY_FLAGS = @VISIBILITY_FLAGS@
 WRAP_SYSTEM_INCLUDES = @WRAP_SYSTEM_INCLUDES@
 
-ENABLE_JIT = @ENABLE_JIT@
+ENABLE_TRACEJIT = @ENABLE_TRACEJIT@
 NANOJIT_ARCH = @NANOJIT_ARCH@
 HAVE_ARM_SIMD= @HAVE_ARM_SIMD@

js/src/configure.in

@@ -2497,28 +2497,28 @@ dnl Configure JIT support
 
 case "$target" in
 i?86-*)
-    ENABLE_JIT=1
+    ENABLE_TRACEJIT=1
     NANOJIT_ARCH=i386
     ;;
 x86_64*-*)
-    ENABLE_JIT=1
+    ENABLE_TRACEJIT=1
     NANOJIT_ARCH=X64
     ;;
 arm*-*)
-    ENABLE_JIT=1
+    ENABLE_TRACEJIT=1
     NANOJIT_ARCH=ARM
     ;;
 sparc*-*)
-    ENABLE_JIT=1
+    ENABLE_TRACEJIT=1
     NANOJIT_ARCH=Sparc
     ;;
 esac
 
-MOZ_ARG_DISABLE_BOOL(jit,
-[  --disable-jit           Disable JIT support],
-  ENABLE_JIT=)
+MOZ_ARG_DISABLE_BOOL(tracejit,
+[  --disable-tracejit           Disable tracing JIT support],
+  ENABLE_TRACEJIT=)
 
-if test "$ENABLE_JIT"; then
+if test "$ENABLE_TRACEJIT"; then
 
 AC_DEFINE(FEATURE_NANOJIT)
 AC_DEFINE(JS_TRACER)
@@ -2560,12 +2560,12 @@ freebsd*|kfreebsd*)
     AC_DEFINE(AVMPLUS_OS2)
     ;;
 *)
-    AC_MSG_ERROR([Unrecognized nanojit platform. Use --disable-jit to build without JIT support.])
+    AC_MSG_ERROR([Unrecognized nanojit platform. Use --disable-tracejit to build without tracing JIT support.])
 esac
 
-fi # ENABLE_JIT
+fi # ENABLE_TRACEJIT
 
-AC_SUBST(ENABLE_JIT)
+AC_SUBST(ENABLE_TRACEJIT)
 AC_SUBST(NANOJIT_ARCH)
 
 if test -z "$SKIP_COMPILER_CHECKS"; then
@@ -4233,8 +4233,8 @@ MOZ_ARG_ENABLE_BOOL(tracevis,
     MOZ_TRACEVIS= )
 if test -n "$MOZ_TRACEVIS"; then
     AC_DEFINE(MOZ_TRACEVIS)
-    if test -z "$ENABLE_JIT"; then
-       AC_MSG_ERROR([--enable-tracevis is incompatible with --disable-jit])
+    if test -z "$ENABLE_TRACEJIT"; then
+       AC_MSG_ERROR([--enable-tracevis is incompatible with --disable-tracejit])
     fi
 fi