Apply workaround for JSValue.h

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
David Abdurachmanov 2018-06-02 17:29:11 +02:00
parent 6bf9af37ea
commit f87fc78339
Signed by: davidlt
GPG Key ID: 7108702C938B13C1
2 changed files with 22 additions and 0 deletions

View File

@ -183,6 +183,9 @@ WEBKITOUTPUTDIR=`pwd`; export WEBKITOUTPUTDIR
--qmakearg="CONFIG+=production_build DEFINES+=HAVE_LIBWEBP=1" \
--makeargs="%{?_smp_mflags}" \
--system-malloc \
%ifarch riscv64
--disable-jit \
%endif
--no-force-sse2
popd
%endif

View File

@ -23,6 +23,25 @@ index 0a7a8bd3..14fbcdbf 100644
ELSE ()
MESSAGE(FATAL_ERROR "Unknown CPU")
ENDIF ()
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
index e5f4362c..f175d09e 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pri
+++ b/Source/JavaScriptCore/JavaScriptCore.pri
@@ -37,6 +37,14 @@ macx: INCLUDEPATH += $$JAVASCRIPTCORE_GENERATED_SOURCES_DIR/$$activeBuildConfig(
win32-*: LIBS += -lwinmm
+# Hack around RISCV64 fail wrt JSValue.h
+# SValue.h unconditionally casts pointer to int32_t.
+# add -fpermissive locally as a workaround
+equals(QT_ARCH, riscv64) {
+ message("JavaScriptCore riscv64 hack: -fpermissive")
+ QMAKE_CXXFLAGS += -fpermissive
+}
+
wince* {
INCLUDEPATH += $$QT.core.sources/../3rdparty/ce-compat
INCLUDEPATH += $$SOURCE_DIR/os-win32
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index 56c6f256..cdcc94c6 100644
--- a/Source/WTF/wtf/Platform.h