diff options
| author | Feng Qian <fqian@google.com> | 2009-08-18 10:14:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-18 10:14:46 -0700 |
| commit | 564ecf9bf107fdbb730fbaa16a90ef84bf9ad12d (patch) | |
| tree | 9136c34dc772507ad3db0c4479c0ed2f062d7fdb | |
| parent | 44e993977fd8e08bd1273e0152252023c25bac4d (diff) | |
| parent | 7793e23e0420919c2970edc4a2ace1aabc3ed385 (diff) | |
| download | external_webkit-564ecf9bf107fdbb730fbaa16a90ef84bf9ad12d.zip external_webkit-564ecf9bf107fdbb730fbaa16a90ef84bf9ad12d.tar.gz external_webkit-564ecf9bf107fdbb730fbaa16a90ef84bf9ad12d.tar.bz2 | |
am 7793e23e: Fix the sim-eng build.
Merge commit '7793e23e0420919c2970edc4a2ace1aabc3ed385' into eclair-plus-aosp
* commit '7793e23e0420919c2970edc4a2ace1aabc3ed385':
Fix the sim-eng build.
| -rw-r--r-- | V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.cc | 4 | ||||
| -rw-r--r-- | V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.h | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.cc b/V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.cc index 27a66bc..bc81076 100644 --- a/V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.cc +++ b/V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.cc @@ -38,6 +38,7 @@ namespace v8 { namespace internal { +#ifdef V8_NATIVE_REGEXP /* * This assembler uses the following register assignment convention * - edx : current character. Must be loaded using LoadCurrentCharacter @@ -1172,4 +1173,7 @@ void RegExpMacroAssemblerIA32::LoadCurrentCharacterUnchecked(int cp_offset, #undef __ + +#endif // V8_NATIVE_REGEXP + }} // namespace v8::internal diff --git a/V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.h b/V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.h index e8b5b2e..d114392 100644 --- a/V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.h +++ b/V8Binding/v8/src/ia32/regexp-macro-assembler-ia32.h @@ -31,6 +31,14 @@ namespace v8 { namespace internal { +#ifndef V8_NATIVE_REGEXP +class RegExpMacroAssemblerIA32: public RegExpMacroAssembler { + public: + RegExpMacroAssemblerIA32() { } + virtual ~RegExpMacroAssemblerIA32() { } +}; + +#else class RegExpMacroAssemblerIA32: public NativeRegExpMacroAssembler { public: RegExpMacroAssemblerIA32(Mode mode, int registers_to_save); @@ -224,6 +232,7 @@ class RegExpMacroAssemblerIA32: public NativeRegExpMacroAssembler { Label check_preempt_label_; Label stack_overflow_label_; }; +#endif // V8_NATIVE_REGEXP }} // namespace v8::internal |