78 lines
2.1 KiB
Plaintext
78 lines
2.1 KiB
Plaintext
From d1ffd868c47c8d20f64a504f4e850f3f5c6a3423 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Mon, 11 Feb 2019 15:51:31 +1000
|
|
Subject: Fix Haiku build
|
|
|
|
|
|
diff --git a/src/3rdparty/masm/wtf/PageBlock.cpp b/src/3rdparty/masm/wtf/PageBlock.cpp
|
|
index e715ed2..1362a13 100644
|
|
--- a/src/3rdparty/masm/wtf/PageBlock.cpp
|
|
+++ b/src/3rdparty/masm/wtf/PageBlock.cpp
|
|
@@ -40,7 +40,14 @@ namespace WTF {
|
|
static size_t s_pageSize;
|
|
static size_t s_pageMask;
|
|
|
|
-#if OS(UNIX)
|
|
+#if OS(HAIKU)
|
|
+
|
|
+inline size_t systemPageSize()
|
|
+{
|
|
+ return 4096;
|
|
+}
|
|
+
|
|
+#elif OS(UNIX)
|
|
|
|
inline size_t systemPageSize()
|
|
{
|
|
diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h
|
|
index ab1da21..5d8617e 100644
|
|
--- a/src/3rdparty/masm/wtf/Platform.h
|
|
+++ b/src/3rdparty/masm/wtf/Platform.h
|
|
@@ -418,6 +418,11 @@
|
|
#define WTF_OS_QNX 1
|
|
#endif
|
|
|
|
+/* OS(HAIKU) - Haiku */
|
|
+#if defined(__HAIKU__)
|
|
+#define WTF_OS_HAIKU 1
|
|
+#endif
|
|
+
|
|
/* OS(SOLARIS) - Solaris */
|
|
#if defined(sun) || defined(__sun)
|
|
#define WTF_OS_SOLARIS 1
|
|
@@ -452,6 +457,7 @@
|
|
|| OS(HURD) \
|
|
|| OS(INTEGRITY) \
|
|
|| OS(LINUX) \
|
|
+ || OS(HAIKU) \
|
|
|| OS(NETBSD) \
|
|
|| OS(OPENBSD) \
|
|
|| OS(QNX) \
|
|
--
|
|
2.28.0
|
|
|
|
|
|
From d50302a60710100ceed487bdbb0d9af9540e5ed7 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Sun, 15 Dec 2019 11:27:19 +1000
|
|
Subject: Enable assembler for JIT
|
|
|
|
|
|
diff --git a/src/qml/jit/qv4assemblercommon_p.h b/src/qml/jit/qv4assemblercommon_p.h
|
|
index ead1e75..58d9635 100644
|
|
--- a/src/qml/jit/qv4assemblercommon_p.h
|
|
+++ b/src/qml/jit/qv4assemblercommon_p.h
|
|
@@ -66,7 +66,7 @@ namespace QV4 {
|
|
namespace JIT {
|
|
|
|
#if defined(Q_PROCESSOR_X86_64) || defined(ENABLE_ALL_ASSEMBLERS_FOR_REFACTORING_PURPOSES)
|
|
-#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN)
|
|
+#if defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_HAIKU)
|
|
|
|
class PlatformAssembler_X86_64_SysV : public JSC::MacroAssembler<JSC::MacroAssemblerX86_64>
|
|
{
|
|
--
|
|
2.28.0
|
|
|
|
|