blob: b054d713503662a971e5061b7529a44b1d61942d (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform
used __ARM_ARCH_6ZK__ instead of __ARM_ARCH_6KZ__.
Append the correct spellings to the checks for __ARM_ARCH_6ZK__.
[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2017-06-02 20:01:34.860331000 +0200
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2017-06-02 20:02:08.715222000 +0200
@@ -254,6 +254,7 @@
#elif defined(__ARM_ARCH_6__) \
|| defined(__ARM_ARCH_6J__) \
|| defined(__ARM_ARCH_6K__) \
+ || defined(__ARM_ARCH_6KZ__) \
|| defined(__ARM_ARCH_6Z__) \
|| defined(__ARM_ARCH_6ZK__) \
|| defined(__ARM_ARCH_6T2__) \
--- src/corelib/arch/qatomic_arm.h.orig 2017-06-02 20:02:52.633112000 +0200
+++ src/corelib/arch/qatomic_arm.h 2017-06-02 20:03:14.263677000 +0200
@@ -57,6 +57,7 @@
|| defined(__ARM_ARCH_6T2__) \
|| defined(__ARM_ARCH_6Z__) \
|| defined(__ARM_ARCH_6K__) \
+ || defined(__ARM_ARCH_6KZ__) \
|| defined(__ARM_ARCH_6ZK__) \
|| defined(__ARM_ARCH_6M__) \
|| (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6))
|
