Attachment 853321 Details for Bug 1056160 – full changeset

[patch] full changeset

0001-add-AArch64-support.patch (text/plain), 2.99 KB, created by Marcin Juszkiewicz on 2014-01-21 15:37:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Juszkiewicz

Created: 2014-01-21 15:37:22 UTC

Size: 2.99 KB

patch

obsolete

>From 7c8d70dbb7705a62d3e8e87c2d7a39eaf298b219 Mon Sep 17 00:00:00 2001
>From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
>Date: Thu, 19 Dec 2013 17:29:23 +0100
>Subject: [PATCH] add AArch64 support
>
>---
> 0001-Add-ARM-64-support.patch | 48 +++++++++++++++++++++++++++++++++++++++++++
> qt5-qtwebkit.spec             |  5 +++++
> 2 files changed, 53 insertions(+)
> create mode 100644 0001-Add-ARM-64-support.patch
>
>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..41ebac0 100644
>--- a/qt5-qtwebkit.spec
>+++ b/qt5-qtwebkit.spec
>@@ -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..."
>-- 
>1.8.4.2
>

Actions: View | Diff

Attachments on bug 1056160: 853321