Bug 784741 - Don't implicitly define ENABLE_YARR_JIT with MethodJIT. r=dmandelin
authorJan Beich <jbeich@tormail.org>
Wed, 22 Aug 2012 21:28:47 -0400
changeset 105141 fa9bc5be6d9b92563811e4d3b89a96cc64fab50d
parent 105140 529608d3f3ff2112b2e89456aa3a056950097c71
child 105142 1b51b88d45aff5db803d756af07aea8ad3951b7b
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersdmandelin
bugs784741
milestone17.0a1
Bug 784741 - Don't implicitly define ENABLE_YARR_JIT with MethodJIT. r=dmandelin
js/src/Makefile.in
js/src/assembler/wtf/Platform.h
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -318,16 +318,17 @@ endif
 ifeq ($(OS_ARCH),OS2)
 CPPSRCS += ExecutableAllocatorOS2.cpp \
            OSAllocatorOS2.cpp \
            $(NONE)
 endif
 
 ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
 ENABLE_YARR_JIT = 1
+DEFINES += -DENABLE_YARR_JIT=1
 
 VPATH += 	$(srcdir)/assembler/assembler \
 		$(srcdir)/methodjit \
 		$(NONE)
 
 CPPSRCS +=	ARMAssembler.cpp \
 		MacroAssemblerARM.cpp \
 		MacroAssemblerX86Common.cpp \
--- a/js/src/assembler/wtf/Platform.h
+++ b/js/src/assembler/wtf/Platform.h
@@ -1097,19 +1097,17 @@
 
 /* Regular Expression Tracing - Set to 1 to trace RegExp's in jsc.  Results dumped at exit */
 #define ENABLE_REGEXP_TRACING 0
 
 /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
 #if WTF_PLATFORM_CHROMIUM
 #define ENABLE_YARR_JIT 0
 
-#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT)
-#define ENABLE_YARR_JIT 1
-
+#elif ENABLE_YARR_JIT
 /* Setting this flag compares JIT results with interpreter results. */
 #define ENABLE_YARR_JIT_DEBUG 0
 #endif
 
 #if ENABLE_JIT || ENABLE_YARR_JIT
 #define ENABLE_ASSEMBLER 1
 #endif
 /* Setting this flag prevents the assembler from using RWX memory; this may improve