From 61c5bb63cfa2a0166e052ce81772519b3ddb298b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 30 Jun 2013 09:29:41 -0700 Subject: webkit-gtk: Adjust the patch to apply on top of OE-Core OE-Core has added patches which needs the patch to be rebased Signed-off-by: Khem Raj Signed-off-by: Riku Voipio --- .../recipes-sato/webkit/files/aarch64.patch | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'meta-aarch64/recipes-sato/webkit/files/aarch64.patch') diff --git a/meta-aarch64/recipes-sato/webkit/files/aarch64.patch b/meta-aarch64/recipes-sato/webkit/files/aarch64.patch index 86b04561..644cc0bf 100644 --- a/meta-aarch64/recipes-sato/webkit/files/aarch64.patch +++ b/meta-aarch64/recipes-sato/webkit/files/aarch64.patch @@ -1,6 +1,8 @@ ---- a/Source/JavaScriptCore/wtf/Platform.h -+++ b/Source/JavaScriptCore/wtf/Platform.h -@@ -299,6 +299,11 @@ +Index: webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h +=================================================================== +--- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:58:14.000000000 -0700 ++++ webkit-1.8.3/Source/JavaScriptCore/wtf/Platform.h 2013-06-12 00:59:18.764056782 -0700 +@@ -304,6 +304,11 @@ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif @@ -12,24 +14,26 @@ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ -@@ -899,7 +904,8 @@ - || CPU(ALPHA) \ +@@ -905,7 +910,8 @@ || CPU(SPARC64) \ || CPU(S390X) \ + || CPU(MIPS64) \ - || CPU(PPC64) + || CPU(PPC64) \ + || CPU(AARCH64) #define WTF_USE_JSVALUE64 1 #else #define WTF_USE_JSVALUE32_64 1 ---- a/Source/JavaScriptCore/wtf/dtoa/utils.h -+++ b/Source/JavaScriptCore/wtf/dtoa/utils.h +Index: webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h +=================================================================== +--- webkit-1.8.3.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:57:22.000000000 -0700 ++++ webkit-1.8.3/Source/JavaScriptCore/wtf/dtoa/utils.h 2013-06-12 00:58:28.340056029 -0700 @@ -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) +-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) ++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) || CPU(AARCH64) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) #if defined(_WIN32) -- cgit v1.2.3