Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-06-03 09:53:35 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2018-06-03 09:53:35 +0200
commit3e6e8bc3d652927e8da863622d2aed331c7fa20d (patch)
treeb8e1e44dafec343bcf11dd5e1b071fb915e95e2e /extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
parent887951bed42417f0519ffe329515a35fbc19c8cc (diff)
extra/qt5-webengine: added uin64-t alignment patch in embedded chromium code
Diffstat (limited to 'extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch')
-rw-r--r--extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch b/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
new file mode 100644
index 00000000..2e72034a
--- /dev/null
+++ b/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch
@@ -0,0 +1,18 @@
+diff -rauN qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/mojo/public/c/system/macros.h qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment-patch/src/3rdparty/chromium/mojo/public/c/system/macros.h
+--- qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-06-03 09:46:38.408293369 +0200
++++ qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment-patch/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-06-03 09:46:54.734960038 +0200
+@@ -18,7 +18,13 @@
+ #endif
+
+ // Like the C++11 |alignof| operator.
+-#if __cplusplus >= 201103L
++#if defined(__GNUC__) && __GNUC__ >= 8
++// GCC 8 has changed the alignof operator to return the minimal alignment
++// required by the target ABI, instead of the preferred alignment.
++// This means that on 32-bit x86, it will return 4 instead of 8.
++// Use __alignof__ instead to avoid this.
++#define MOJO_ALIGNOF(type) __alignof__(type)
++#elif __cplusplus >= 201103L
+ #define MOJO_ALIGNOF(type) alignof(type)
+ #elif defined(__GNUC__)
+ #define MOJO_ALIGNOF(type) __alignof__(type)