diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 16:32:00 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 17:07:33 +0300 |
commit | 1b356a70d61547992d51025e6a1b6edb48886bb6 (patch) | |
tree | f11b34a8e39e37fb3017ddb5c3119dfd6f011022 /recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch | |
parent | 78b8872328a2162c1030831a36d0814da6c200a5 (diff) | |
parent | 9ffdd55c7c03d9e608409a95ed4c51ae0fb3d511 (diff) | |
download | meta-qt5-1b356a70d61547992d51025e6a1b6edb48886bb6.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
qtscript: Update the custom patch from mainline
qtbase: remove renameat2 PACKAGECONFIG
qtbase: fix build with glibc-2.28 - for non-readers like me
qtwebengine: Fix optonal glib-2.0 dependency
qtwebkit_git.bb: Fix configure failure on bison
qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker
qtwebengine: add a package config to enable proprietary codecs
qt3d-runtime: add recipe for Qt 3D Studio runtime library
qtbase: update the dependency for gbm PACKAGECONFIG
qtbase: fix build with glibc-2.28
nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
qtchooser: drop useless patch, set PV
packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
qtbase: Add a kde PACKAGECONFIG
Change-Id: I8b407611ee7473bbd00ece06f6613d93ca56ca0d
Diffstat (limited to 'recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch')
-rw-r--r-- | recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch new file mode 100644 index 00000000..878a8ab9 --- /dev/null +++ b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 21781f11a71d4e6449d89372aa9cc5b95ce8a67c Mon Sep 17 00:00:00 2001 | ||
2 | From: Alistair Francis <alistair.francis@wdc.com> | ||
3 | Date: Wed, 18 Jul 2018 14:26:21 -0700 | ||
4 | Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support | ||
5 | |||
6 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | ||
7 | Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57 | ||
8 | Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | --- | ||
12 | .../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 ++++++++++++-- | ||
13 | 1 file changed, 12 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
16 | index 00caa6d..96942c7 100644 | ||
17 | --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
18 | +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | ||
19 | @@ -397,6 +397,16 @@ | ||
20 | #endif | ||
21 | #endif /* __mips__ */ | ||
22 | |||
23 | +/* CPU(RISCV64) - RISC-V 64-bit */ | ||
24 | +#if defined(__riscv) && __riscv_xlen == 64 | ||
25 | +#define WTF_CPU_RISCV64 1 | ||
26 | +#endif | ||
27 | + | ||
28 | +/* CPU(RISCV32) - RISC-V 32-bit */ | ||
29 | +#if defined(__riscv) && __riscv_xlen == 32 | ||
30 | +#define WTF_CPU_RISCV32 1 | ||
31 | +#endif | ||
32 | + | ||
33 | /* ==== OS() - underlying operating system; only to be used for mandated low-level services like | ||
34 | virtual memory, not to choose a GUI toolkit ==== */ | ||
35 | |||
36 | @@ -948,9 +958,9 @@ | ||
37 | #endif | ||
38 | |||
39 | #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) | ||
40 | -#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) | ||
41 | +#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) | ||
42 | #define WTF_USE_JSVALUE64 1 | ||
43 | -#elif CPU(ARM) || CPU(PPC64) | ||
44 | +#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) | ||
45 | #define WTF_USE_JSVALUE32 1 | ||
46 | #elif OS(WINDOWS) && COMPILER(MINGW) | ||
47 | /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg | ||
48 | -- | ||
49 | 2.17.1 | ||
50 | |||