diff mbox

[v2,1/1] webkitgtk: Add patches which allow building for ARMv8-A

Message ID 20170729125827.15627-1-aperez@igalia.com
State Superseded, archived
Headers show

Commit Message

Adrian Perez de Castro July 29, 2017, 12:58 p.m. UTC 
The two added patches allow building WebKitGTK+ when the compiler
scpecifically targets ARMv8-A, and reports as such be pre-defining
__ARCH_ARM_8A__ instead of just __ARCH_ARM_8__. Both patches were
pulled from the corresponding upstream bug reports and edited to
remove the conflicting parts which edit the ChangeLog files.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 ...-to-build-when-the-compiler-specifically-.patch | 54 ++++++++++++++++++++++
 ...lure-to-build-when-the-compiler-specifica.patch | 54 ++++++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch
 create mode 100644 package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
diff mbox

Patch

diff --git a/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch b/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch
new file mode 100644
index 0000000000..0259f6e173
--- /dev/null
+++ b/package/webkitgtk/0001-WTF-Failure-to-build-when-the-compiler-specifically-.patch
@@ -0,0 +1,54 @@ 
+From 136a378d3ce1f81676aafac4a6e225db76dafa29 Mon Sep 17 00:00:00 2001
+From: "aperez@igalia.com"
+ <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Wed, 12 Jul 2017 18:42:29 +0000
+Subject: [PATCH] [WTF] Failure to build when the compiler specifically targets
+ ARMv8-A / defines __ARM_ARCH_8A__
+ https://bugs.webkit.org/show_bug.cgi?id=174425
+
+Reviewed by Michael Catanzaro.
+
+* wtf/Platform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8.
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219415 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WTF/ChangeLog      | 9 +++++++++
+ Source/WTF/wtf/Platform.h | 3 ++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
+index 819c6627423..d5c67f2acae 100644
+--- a/Source/WTF/ChangeLog
++++ b/Source/WTF/ChangeLog
+@@ -1,3 +1,12 @@
++2017-07-12  Adrian Perez de Castro  <aperez@igalia.com>
++
++        [WTF] Failure to build when the compiler specifically targets ARMv8-A / defines __ARM_ARCH_8A__
++        https://bugs.webkit.org/show_bug.cgi?id=174425
++
++        Reviewed by Michael Catanzaro.
++
++        * wtf/Platform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8.
++
+ 2017-06-08  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+ 
+         MediaTime class has rounding issues in different platforms
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 44d929c333c..7dccb44fcbf 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -238,7 +238,8 @@
+     || defined(__ARM_ARCH_7S__)
+ #define WTF_ARM_ARCH_VERSION 7
+ 
+-#elif defined(__ARM_ARCH_8__)
++#elif defined(__ARM_ARCH_8__) \
++    || defined(__ARM_ARCH_8A__)
+ #define WTF_ARM_ARCH_VERSION 8
+ 
+ /* MSVC sets _M_ARM */
+-- 
+2.13.3
+
diff --git a/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch b/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
new file mode 100644
index 0000000000..fa4404c6a9
--- /dev/null
+++ b/package/webkitgtk/0002-bmalloc-Failure-to-build-when-the-compiler-specifica.patch
@@ -0,0 +1,54 @@ 
+From 6e3bdf8403c4aaf0e35b1f7f5369364db9b31d54 Mon Sep 17 00:00:00 2001
+From: "aperez@igalia.com"
+ <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Wed, 12 Jul 2017 18:43:36 +0000
+Subject: [PATCH] bmalloc: Failure to build when the compiler specifically
+ targets ARMv8-A / defines __ARM_ARCH_8A__
+ https://bugs.webkit.org/show_bug.cgi?id=174424
+
+Reviewed by Michael Catanzaro.
+
+* bmalloc/BPlatform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8.
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@219416 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/bmalloc/ChangeLog           | 9 +++++++++
+ Source/bmalloc/bmalloc/BPlatform.h | 3 ++-
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
+index cbd157f2291..63bda868e24 100644
+--- a/Source/bmalloc/ChangeLog
++++ b/Source/bmalloc/ChangeLog
+@@ -1,3 +1,12 @@
++2017-07-12  Adrian Perez de Castro  <aperez@igalia.com>
++
++        bmalloc: Failure to build when the compiler specifically targets ARMv8-A / defines __ARM_ARCH_8A__
++        https://bugs.webkit.org/show_bug.cgi?id=174424
++
++        Reviewed by Michael Catanzaro.
++
++        * bmalloc/BPlatform.h: Also check for __ARCH_ARM_8A__ to detect ARMv8.
++
+ 2017-04-27  Michael Saboff  <msaboff@apple.com>
+ 
+         bmalloc scavenger should know what page classes are allocating
+diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h
+index 8d768db63fb..400143a63fb 100644
+--- a/Source/bmalloc/bmalloc/BPlatform.h
++++ b/Source/bmalloc/bmalloc/BPlatform.h
+@@ -120,7 +120,8 @@
+ || defined(__ARM_ARCH_7S__)
+ #define BARM_ARCH_VERSION 7
+ 
+-#elif defined(__ARM_ARCH_8__)
++#elif defined(__ARM_ARCH_8__) \
++|| defined(__ARM_ARCH_8A__)
+ #define BARM_ARCH_VERSION 8
+ 
+ /* MSVC sets _M_ARM */
+-- 
+2.13.3
+