[qt5-qtwebkit] Add AArch64 support to qtwebkit (#1056160)

Rex Dieter rdieter at fedoraproject.org
Sun Feb 2 21:31:50 UTC 2014


commit 0c9acfe03f6eaa29946aef449961b6a9df0bb872
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Feb 2 15:32:20 2014 -0600

    Add AArch64 support to qtwebkit (#1056160)

 0001-Add-ARM-64-support.patch |   48 +++++++++++++++++++++++++++++++++++++++++
 qt5-qtwebkit.spec             |   10 +++++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-ARM-64-support.patch b/0001-Add-ARM-64-support.patch
new file mode 100644
index 0000000..acf83fe
--- /dev/null
+++ b/0001-Add-ARM-64-support.patch
@@ -0,0 +1,48 @@
+Index: qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/dtoa/utils.h
+===================================================================
+--- qtwebkit-opensource-src-5.2.0.orig/Source/WTF/wtf/dtoa/utils.h
++++ qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/dtoa/utils.h
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #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)
+Index: qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/Platform.h
+===================================================================
+--- qtwebkit-opensource-src-5.2.0.orig/Source/WTF/wtf/Platform.h
++++ qtwebkit-opensource-src-5.2.0/Source/WTF/wtf/Platform.h
+@@ -167,6 +167,11 @@
+ #define WTF_CPU_X86_64 1
+ #endif
+ 
++/* CPU(AARCH64) - AArch64 */
++#if defined(__aarch64__)
++#define WTF_CPU_AARCH64 1
++#endif
++
+ /* CPU(ARM) - ARM, any version*/
+ #define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N)
+ 
+@@ -322,7 +327,7 @@
+ 
+ #endif /* ARM */
+ 
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(AARCH64)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
+@@ -725,7 +730,8 @@
+     || CPU(ALPHA) \
+     || CPU(SPARC64) \
+     || CPU(S390X) \
+-    || CPU(PPC64)
++    || CPU(PPC64) \
++    || CPU(AARCH64)
+ #define WTF_USE_JSVALUE64 1
+ #else
+ #define WTF_USE_JSVALUE32_64 1
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index bd884a6..5ff5142 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -11,7 +11,7 @@
 Summary: Qt5 - QtWebKit components
 Name:    qt5-qtwebkit
 Version: 5.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -39,6 +39,10 @@ Patch5: qtwebkit-opensource-src-5.0.2-system_angle.patch
 # Fix compilation against latest ANGLE
 # https://bugs.webkit.org/show_bug.cgi?id=109127
 Patch6: webkit-commit-142567.patch
+
+# Add AArch64 support
+Patch7: 0001-Add-ARM-64-support.patch
+
 %if 0%{?system_angle}
 BuildRequires: angleproject-devel angleproject-static
 %endif
@@ -116,6 +120,7 @@ BuildArch: noarch
 #patch5 -p1 -b .system_angle
 %patch6 -p1 -b .svn142567
 %endif
+%patch7 -p1 -b .aarch64
 %patch10 -p1 -b .nojit
 
 echo "nuke bundled code..."
@@ -205,6 +210,9 @@ popd
 
 
 %changelog
+* Sun Feb 02 2014 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-3
+- Add AArch64 support to qtwebkit (#1056160)
+
 * Wed Jan 01 2014 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-2
 - rebuild (libwebp)
 


More information about the scm-commits mailing list