diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-08 10:25:21 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-08 10:25:21 +0200 |
| commit | db7ceaa25ccc98edb63fe832075ff16cb6bac86d (patch) | |
| tree | af6fd532104707e9913bd8c983def29aeb507dc9 /masm | |
| parent | 183d1c4e39aca586fb58cc7effb25d1281459254 (diff) | |
Fix non-release builds
Diffstat (limited to 'masm')
| -rw-r--r-- | masm/masm.pri | 1 | ||||
| -rw-r--r-- | masm/stubs/ExecutableAllocator.h | 2 | ||||
| -rw-r--r-- | masm/stubs/Options.h | 12 | ||||
| -rw-r--r-- | masm/stubs/WTFStubs.cpp | 27 |
4 files changed, 40 insertions, 2 deletions
diff --git a/masm/masm.pri b/masm/masm.pri index 502df9132c..b349172d8d 100644 --- a/masm/masm.pri +++ b/masm/masm.pri @@ -7,7 +7,6 @@ SOURCES += $$PWD/assembler/MacroAssemblerSH4.cpp SOURCES += $$PWD/assembler/LinkBuffer.cpp SOURCES += $$PWD/stubs/WTFStubs.cpp -DEFINES += NDEBUG DEFINES += WTF_EXPORT_PRIVATE="" INCLUDEPATH += $$PWD/jit diff --git a/masm/stubs/ExecutableAllocator.h b/masm/stubs/ExecutableAllocator.h index 72605e0411..6928b3b87d 100644 --- a/masm/stubs/ExecutableAllocator.h +++ b/masm/stubs/ExecutableAllocator.h @@ -21,6 +21,8 @@ struct ExecutableMemoryHandle : public RefCounted<ExecutableMemoryHandle> { free(m_data); } + inline bool isManaged() const { return true; } + void* start() { return m_data; } int sizeInBytes() { return m_size; } diff --git a/masm/stubs/Options.h b/masm/stubs/Options.h index 8b13789179..3d40363531 100644 --- a/masm/stubs/Options.h +++ b/masm/stubs/Options.h @@ -1 +1,13 @@ +#ifndef OPTIONS_H +#define OPTIONS_H +namespace JSC { + +struct Options { + static bool showDisassembly() { return true; } + static bool showDFGDisassembly() { return true; } +}; + +} + +#endif // MASM_STUBS/OPTIONS_H diff --git a/masm/stubs/WTFStubs.cpp b/masm/stubs/WTFStubs.cpp index c649e7f025..93cfbf2095 100644 --- a/masm/stubs/WTFStubs.cpp +++ b/masm/stubs/WTFStubs.cpp @@ -1,3 +1,4 @@ +#include <config.h> #include <stdlib.h> #include <stdio.h> #include <stdarg.h> @@ -16,7 +17,7 @@ void fastFree(void* ptr) free(ptr); } -int cryptographicallyRandomNumber() +uint32_t cryptographicallyRandomNumber() { return 0; } @@ -45,3 +46,27 @@ void dataLogString(const char* str) } } + +extern "C" { + +void WTFReportAssertionFailure(const char* file, int line, const char* function, const char* assertion) +{ +} + +void WTFReportBacktrace() +{ +} + +void WTFInvokeCrashHook() +{ +} + +} + + +#if ENABLE(ASSEMBLER) && CPU(X86) && !OS(MAC_OS_X) +#include <MacroAssemblerX86Common.h> + +JSC::MacroAssemblerX86Common::SSE2CheckState JSC::MacroAssemblerX86Common::s_sse2CheckState = JSC::MacroAssemblerX86Common::NotCheckedSSE2; +#endif + |