Merge branch 'master' into 'master'

Fix aarch64 build and disable the rest of v8-private See merge request !6
sailfishos · Apr 27, 2016 · cd5249a · cd5249a
2 parents 60c54af + ebdae38
commit cd5249a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/qtwebkit/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/qtwebkit/Source/JavaScriptCore/bytecode/CodeBlock.cpp
@@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization()
 
 unsigned CodeBlock::numberOfDFGCompiles()
 {
+#if ENABLE(JIT)
     ASSERT(JITCode::isBaselineCode(getJITType()));
     return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter;
+#else
+    return 0;
+#endif
 }
 
 int32_t CodeBlock::codeTypeThresholdMultiplier() const

diff --git a/qtwebkit/Source/WTF/wtf/Platform.h b/qtwebkit/Source/WTF/wtf/Platform.h
@@ -322,6 +322,14 @@
 
 #endif /* ARM */
 
+/* CPU(AARCH64) - AArch64 */
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#if defined(__AARCH64EB__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+#endif
+
 #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
 #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
 #endif
@@ -725,6 +733,7 @@
     || CPU(ALPHA) \
     || CPU(SPARC64) \
     || CPU(S390X) \
+    || CPU(AARCH64) \
     || CPU(PPC64)
 #define WTF_USE_JSVALUE64 1
 #else

diff --git a/qtwebkit/Source/WTF/wtf/dtoa/utils.h b/qtwebkit/Source/WTF/wtf/dtoa/utils.h
@@ -47,9 +47,10 @@
 // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
 #if defined(_M_X64) || defined(__x86_64__) || \
 defined(__ARMEL__) || \
-defined(_MIPS_ARCH_MIPS32R2)
+defined(_MIPS_ARCH_MIPS32R2) || \
+defined(__AARCH64EL__) || defined(__aarch64__)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(AARCH64)
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
 #elif defined(_M_IX86) || defined(__i386__)
 #if defined(_WIN32)

diff --git a/rpm/qtwebkit5.spec b/rpm/qtwebkit5.spec
@@ -157,11 +157,19 @@ export QMAKEPATH="`pwd`/Tools/qmake"
 export QTDIR=/usr/share/qt5
 #
 touch .git
+
+%ifarch aarch64
+%global qtdefines  DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
+%else
+%global qtdefines  
+%endif
+
 #
 # Configure to release build, drop tests, mimic Tools/qmake/mkspecs/features/production_build.prf for the whole
 # build not just WebCore. We could also drop WebKit1 support aka libqtwebkit5-widgets with WEBKIT_CONFIG-=build_webkit1.
 # See also Tools/qmake/mkspecs/features/features.prf.
 qmake -qt=5 CONFIG+=release CONFIG-=debug \
+       %{?qtdefines} \
        WEBKIT_CONFIG-=build_tests \
        CONFIG+=no_debug_info \
        CONFIG-=separate_debug_info \
@@ -201,12 +209,6 @@ find %{buildroot}%{_libdir} -type f -name '*.prl' \
 %fdupes %{buildroot}/%{_libdir}
 %fdupes %{buildroot}/%{_includedir}
 
-
-
-
-
-
-
 %post -n libqtwebkit5 -p /sbin/ldconfig
 
 %postun -n libqtwebkit5 -p /sbin/ldconfig
@@ -215,11 +217,6 @@ find %{buildroot}%{_libdir} -type f -name '*.prl' \
 
 %postun -n libqtwebkit5-widgets -p /sbin/ldconfig
 
-
-
-
-
-
 %files uiprocess-launcher
 %defattr(-,root,root,-)
 %{_libdir}/qt5/libexec/QtWebProcess