Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 10:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 890171 - Cleanup old jaegermonkey defines in js/sc/configure. r=luke

Browse Source
This commit is contained in:
Makoto Kato 2013-07-09 14:30:11 +09:00
parent b474b910a6
commit 0c12a0cd10
4 changed files with 3 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/Makefile.in
View File

@ -334,10 +334,7 @@ check-jstests:
# #
# Bug 652155: On Mac, SM(d) doesn't work for unknown reasons # Bug 652155: On Mac, SM(d) doesn't work for unknown reasons
ifeq ($(OS_ARCH),WINNT) ifneq ($(OS_ARCH),WINNT)
ifdef ENABLE_METHODJIT
endif
else
ifndef HAVE_DTRACE ifndef HAVE_DTRACE
#check:: check-jstests #check:: check-jstests
endif endif

41
js/src/configure.in
View File

@ -2067,41 +2067,25 @@ dnl Configure JIT support
case "$target" in case "$target" in
i?86-*) i?86-*)
ENABLE_METHODJIT=1
ENABLE_ION=1 ENABLE_ION=1
ENABLE_MONOIC=1
ENABLE_POLYIC=1
ENABLE_METHODJIT_TYPED_ARRAY=1
ENABLE_YARR_JIT=1 ENABLE_YARR_JIT=1
AC_DEFINE(JS_CPU_X86) AC_DEFINE(JS_CPU_X86)
AC_DEFINE(JS_NUNBOX32) AC_DEFINE(JS_NUNBOX32)
;; ;;
x86_64*-*) x86_64*-*)
ENABLE_METHODJIT=1
ENABLE_ION=1 ENABLE_ION=1
ENABLE_MONOIC=1
ENABLE_POLYIC=1
ENABLE_METHODJIT_TYPED_ARRAY=1
ENABLE_YARR_JIT=1 ENABLE_YARR_JIT=1
AC_DEFINE(JS_CPU_X64) AC_DEFINE(JS_CPU_X64)
AC_DEFINE(JS_PUNBOX64) AC_DEFINE(JS_PUNBOX64)
;; ;;
arm*-*) arm*-*)
ENABLE_METHODJIT=1
ENABLE_ION=1 ENABLE_ION=1
ENABLE_MONOIC=1
ENABLE_POLYIC=1
ENABLE_METHODJIT_TYPED_ARRAY=1
ENABLE_YARR_JIT=1 ENABLE_YARR_JIT=1
AC_DEFINE(JS_CPU_ARM) AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32) AC_DEFINE(JS_NUNBOX32)
;; ;;
sparc*-*) sparc*-*)
if test ! "$HAVE_64BIT_OS" ; then if test ! "$HAVE_64BIT_OS" ; then
ENABLE_METHODJIT=1
ENABLE_MONOIC=1
ENABLE_POLYIC=1
ENABLE_METHODJIT_TYPED_ARRAY=1
ENABLE_YARR_JIT=1 ENABLE_YARR_JIT=1
dnl ENABLE_ION=0 dnl ENABLE_ION=0
AC_DEFINE(JS_CPU_SPARC) AC_DEFINE(JS_CPU_SPARC)
@ -2109,10 +2093,6 @@ dnl ENABLE_ION=0
fi fi
;; ;;
mips*-*) mips*-*)
ENABLE_METHODJIT=1
ENABLE_MONOIC=1
ENABLE_POLYIC=1
ENABLE_METHODJIT_TYPED_ARRAY=1
ENABLE_YARR_JIT=1 ENABLE_YARR_JIT=1
AC_DEFINE(JS_CPU_MIPS) AC_DEFINE(JS_CPU_MIPS)
AC_DEFINE(JS_NUNBOX32) AC_DEFINE(JS_NUNBOX32)
@ -2127,27 +2107,8 @@ MOZ_ARG_DISABLE_BOOL(yarr-jit,
[ --disable-yarr-jit Disable YARR JIT support], [ --disable-yarr-jit Disable YARR JIT support],
ENABLE_YARR_JIT= ) ENABLE_YARR_JIT= )
AC_SUBST(ENABLE_METHODJIT)
AC_SUBST(ENABLE_METHODJIT_SPEW) 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) AC_SUBST(ENABLE_ION)
if test "$ENABLE_ION"; then if test "$ENABLE_ION"; then
@ -3278,7 +3239,7 @@ MOZ_ARG_ENABLE_STRING(debug,
(using compiler flags DBG)], (using compiler flags DBG)],
[ if test "$enableval" != "no"; then [ if test "$enableval" != "no"; then
MOZ_DEBUG=1 MOZ_DEBUG=1
if test "$ENABLE_METHODJIT" -o "$ENABLE_YARR_JIT"; then if test "$ENABLE_YARR_JIT"; then
# needs MethodJIT or YarrJIT # needs MethodJIT or YarrJIT
ENABLE_METHODJIT_SPEW=1 ENABLE_METHODJIT_SPEW=1
fi fi

2
js/src/ion/Registers.h
View File

@ -19,7 +19,7 @@
#include "ion/FixedArityList.h" #include "ion/FixedArityList.h"
// ARM defines the RegisterID within Architecture-arm.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" #include "assembler/assembler/MacroAssembler.h"
#endif #endif

4
js/src/js-config.h.in
View File

@ -38,10 +38,6 @@
JS_HAVE_STDINT_H. */ JS_HAVE_STDINT_H. */
#undef JS_BYTES_PER_WORD #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 */ /* MOZILLA JSAPI version number components */
#undef MOZJS_MAJOR_VERSION #undef MOZJS_MAJOR_VERSION
#undef MOZJS_MINOR_VERSION #undef MOZJS_MINOR_VERSION