Attachment 869193 Details for Bug 1070446 – AArch64 patch + disable JIT

[patch] AArch64 patch + disable JIT

raw.txt (text/plain), 3.14 KB, created by Marcin Juszkiewicz on 2014-02-28 20:20:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Juszkiewicz

Created: 2014-02-28 20:20:22 UTC

Size: 3.14 KB

patch

obsolete

>diff --git a/0001-Add-ARM-64-support.patch b/0001-Add-ARM-64-support.patch
>new file mode 100644
>index 0000000..9361b06
>--- /dev/null
>+++ b/0001-Add-ARM-64-support.patch
>@@ -0,0 +1,48 @@
>+Index: webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h
>+===================================================================
>+--- webkit-qtwebkit-23.orig/Source/WTF/wtf/dtoa/utils.h
>++++ webkit-qtwebkit-23/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: webkit-qtwebkit-23/Source/WTF/wtf/Platform.h
>+===================================================================
>+--- webkit-qtwebkit-23.orig/Source/WTF/wtf/Platform.h
>++++ webkit-qtwebkit-23/Source/WTF/wtf/Platform.h
>+@@ -162,6 +162,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*/
>+ #if   defined(arm) \
>+     || defined(__arm__) \
>+@@ -312,7 +317,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
>+ 
>+@@ -874,7 +879,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/qtwebkit.spec b/qtwebkit.spec
>index b509262..2bee324 100644
>--- a/qtwebkit.spec
>+++ b/qtwebkit.spec
>@@ -46,6 +46,9 @@ Patch11: qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
> # https://qt.gitorious.org/qt/qtwebkit/commit/60ba8bd5b3575d
> Patch12: glslang_bison3.patch
> 
>+# Basic AArch64 support (from qt5 upstream)
>+Patch13: 0001-Add-ARM-64-support.patch
>+
> ## upstream patches
> Patch102: 0002-Texmap-GTK-The-poster-circle-doesn-t-appear.patch
> Patch103: 0003-Qt-Tiled-backing-store-not-clipped-to-frame-or-visib.patch
>@@ -124,6 +127,7 @@ Provides:  qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
> %patch11 -p1 -b .Double2Ints
> %endif
> %patch12 -p1 -b .bison3
>+%patch13 -p1
> %patch102 -p1 -b .0002
> %patch103 -p1 -b .0003
> %patch104 -p1 -b .0004
>@@ -151,11 +155,17 @@ PATH=%{_qt4_bindir}:$PATH; export PATH
> QMAKEPATH=`pwd`/Tools/qmake; export QMAKEPATH
> QTDIR=%{_qt4_prefix}; export QTDIR
> 
>+%ifarch aarch64
>+%global qtdefines  DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0 DEFINES+=ENABLE_ASSEMBLER=0
>+%else
>+%global qtdefines  
>+%endif
>+
> mkdir -p %{_target_platform}
> pushd    %{_target_platform}
> WEBKITOUTPUTDIR=`pwd`; export WEBKITOUTPUTDIR
> ../Tools/Scripts/build-webkit \
>-  --qt \
>+  --qt %{?qtdefines} \
>   --no-webkit2 \
>   --release \
>   --qmakearg="CONFIG+=production_build DEFINES+=HAVE_LIBWEBP=1" \

Actions: View | Diff

Attachments on bug 1070446: 869151 | 869193