mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-03 20:54:37 +02:00
9ffdd55c7c
Update the custom qtscript patch to use a backported patch instead. Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
From 21781f11a71d4e6449d89372aa9cc5b95ce8a67c Mon Sep 17 00:00:00 2001
|
|
From: Alistair Francis <alistair.francis@wdc.com>
|
|
Date: Wed, 18 Jul 2018 14:26:21 -0700
|
|
Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support
|
|
|
|
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
|
Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57
|
|
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
Upstream-Status: Backport
|
|
---
|
|
.../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
|
index 00caa6d..96942c7 100644
|
|
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
|
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
|
@@ -397,6 +397,16 @@
|
|
#endif
|
|
#endif /* __mips__ */
|
|
|
|
+/* CPU(RISCV64) - RISC-V 64-bit */
|
|
+#if defined(__riscv) && __riscv_xlen == 64
|
|
+#define WTF_CPU_RISCV64 1
|
|
+#endif
|
|
+
|
|
+/* CPU(RISCV32) - RISC-V 32-bit */
|
|
+#if defined(__riscv) && __riscv_xlen == 32
|
|
+#define WTF_CPU_RISCV32 1
|
|
+#endif
|
|
+
|
|
/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
|
|
virtual memory, not to choose a GUI toolkit ==== */
|
|
|
|
@@ -948,9 +958,9 @@
|
|
#endif
|
|
|
|
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
|
|
-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
|
|
+#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64)
|
|
#define WTF_USE_JSVALUE64 1
|
|
-#elif CPU(ARM) || CPU(PPC64)
|
|
+#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32)
|
|
#define WTF_USE_JSVALUE32 1
|
|
#elif OS(WINDOWS) && COMPILER(MINGW)
|
|
/* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg
|
|
--
|
|
2.17.1
|
|
|