From 9ffdd55c7c03d9e608409a95ed4c51ae0fb3d511 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 30 Aug 2018 16:55:01 -0700 Subject: qtscript: Update the custom patch from mainline Update the custom qtscript patch to use a backported patch instead. Signed-off-by: Alistair Francis --- ...rdparty-javascriptcore-Add-RISC-V-support.patch | 50 +++++++++++++++++++ .../0001-javascriptcore-Use-64-bit-ints.patch | 58 ---------------------- recipes-qt/qt5/qtscript_git.bb | 2 +- 3 files changed, 51 insertions(+), 59 deletions(-) create mode 100644 recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch delete mode 100644 recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch 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 @@ +From 21781f11a71d4e6449d89372aa9cc5b95ce8a67c Mon Sep 17 00:00:00 2001 +From: Alistair Francis +Date: Wed, 18 Jul 2018 14:26:21 -0700 +Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support + +Signed-off-by: Alistair Francis +Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57 +Reviewed-by: Simon Hausmann + +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 + diff --git a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch b/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch deleted file mode 100644 index a083decf..00000000 --- a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 8fd53951d53ef8c5b62fe985665dad0545bb3161 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Mon, 4 Jun 2018 14:24:59 -0700 -Subject: [PATCH] javascriptcore: Use 64-bit ints - -Where required use 64-bit integers for casts. - -Signed-off-by: Alistair Francis -Upstream-Status: Pending ---- - .../JavaScriptCore/assembler/X86Assembler.h | 2 +- - .../javascriptcore/JavaScriptCore/runtime/JSValue.h | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -index ab3d05f..ed5965f 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -@@ -2033,7 +2033,7 @@ private: - } - } - --#if !CPU(X86_64) -+#if CPU(X86) - void memoryModRM(int reg, void* address) - { - // noBase + ModRmMemoryNoDisp means noBase + ModRmMemoryDisp32! -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -index 7584c52..958ac89 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -@@ -490,7 +490,11 @@ namespace JSC { - u.asBits.tag = CellTag; - else - u.asBits.tag = EmptyValueTag; -+#if CPU(X86) - u.asBits.payload = reinterpret_cast(ptr); -+#else -+ u.asBits.payload = reinterpret_cast(ptr); -+#endif - #if ENABLE(JSC_ZOMBIES) - ASSERT(!isZombie()); - #endif -@@ -502,7 +506,11 @@ namespace JSC { - u.asBits.tag = CellTag; - else - u.asBits.tag = EmptyValueTag; -+#if CPU(X86) - u.asBits.payload = reinterpret_cast(const_cast(ptr)); -+#else -+ u.asBits.payload = reinterpret_cast(const_cast(ptr)); -+#endif - #if ENABLE(JSC_ZOMBIES) - ASSERT(!isZombie()); - #endif --- -2.17.1 - diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 5c1e2e10..4f18ffd0 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -SRC_URI += "file://0001-javascriptcore-Use-64-bit-ints.patch" +SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch" # qemuarm build fails with: # /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': -- cgit v1.2.3