Fix non-release builds

diff --git a/masm/masm.pri b/masm/masm.pri
index 502df91..b349172 100644 (file)
--- 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 72605e0..6928b3b 100644 (file)
--- 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 8b13789..3d40363 100644 (file)
--- 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 c649e7f..93cfbf2 100644 (file)
--- 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
+

diff --git a/qv4ir_p.h b/qv4ir_p.h
index 53c75f7..120f0df 100644 (file)
--- a/qv4ir_p.h
+++ b/qv4ir_p.h
@@ -59,6 +59,7 @@
 #include <QtCore/QString>
 #include <QtCore/QBitArray>
 
+#include <config.h>
 #include <assembler/MacroAssemblerCodeRef.h>
 
 QT_BEGIN_HEADER