wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

[Bug 587183] TM merge broke android in Nitro. r=sayrer.

Browse Source
This commit is contained in:
Chris Leary 2010-08-14 16:46:37 -07:00
parent d12e22150a
commit 2d26e0cfc8
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/Makefile.in
View File

@ -825,12 +825,18 @@ endif
# BEGIN kludges for the Nitro assembler
#
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
#
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
CXXFLAGS += -DENABLE_ASSEMBLER=1 -DUSE_SYSTEM_MALLOC=1 -DENABLE_JIT=1
CXXFLAGS += -DUSE_SYSTEM_MALLOC=1
ifeq (android,$(TARGET_VENDOR))
CXXFLAGS += -DWTF_PLATFORM_ANDROID=1
else
CXXFLAGS += -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
endif
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
#
# END kludges for the Nitro assembler

6
js/src/assembler/wtf/Platform.h
View File

@ -874,10 +874,10 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
#if !defined(ENABLE_YARR_JIT)
/* YARR supports x86 & x86-64, and has been tested on Mac and Windows. */
#if WTF_CPU_X86 \
#if (WTF_CPU_X86 \
|| WTF_CPU_X86_64 \
|| WTF_CPU_ARM_THUMB2 \
|| WTF_CPU_X86
|| WTF_CPU_X86) && !WTF_PLATFORM_ANDROID
#define ENABLE_YARR_JIT 1
#else
#define ENABLE_YARR_JIT 0
@ -885,7 +885,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
#endif /* !defined(ENABLE_YARR_JIT) */
#if ENABLE_JIT || ENABLE_YARR_JIT
#if (ENABLE_JIT || ENABLE_YARR_JIT) && !WTF_PLATFORM_ANDROID
#define ENABLE_ASSEMBLER 1
#endif
/* Setting this flag prevents the assembler from using RWX memory; this may improve

4
js/src/yarr/yarr/RegexJIT.cpp
View File

@ -25,14 +25,14 @@
#include "RegexJIT.h"
#if ENABLE_ASSEMBLER
#include "assembler/assembler/LinkBuffer.h"
#include "assembler/assembler/MacroAssembler.h"
#include "RegexCompiler.h"
#include "yarr/pcre/pcre.h" // temporary, remove when fallback is removed.
#if ENABLE_YARR_JIT
using namespace WTF;
namespace JSC { namespace Yarr {

4
js/src/yarr/yarr/RegexJIT.h
View File

@ -26,6 +26,8 @@
#ifndef RegexJIT_h
#define RegexJIT_h
#if ENABLE_ASSEMBLER
#include "assembler/assembler/MacroAssembler.h"
#include "assembler/assembler/MacroAssemblerCodeRef.h"
#include "assembler/jit/ExecutableAllocator.h"
@ -92,4 +94,6 @@ inline int executeRegex(JSContext *cx, RegexCodeBlock& jitObject, const UChar* i
} } // namespace JSC::Yarr
#endif /* ENABLE_ASSEMBLER */
#endif // RegexJIT_h