ports/devel/qt4/files/extrapatch-armv6
Tobias C. Berner 4440fb81d4 Fix qt4 ports on armv6.
Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform
used ARM_ARCH_6ZK instead of ARM_ARCH_6KZ.

[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html

PR:		210027
Submitted by:	Mikaël Urankar <mikael.urankar@gmail.com>
Reviewed by:	rakuco
Differential Revision:	https://reviews.freebsd.org/D8322
2017-06-06 05:00:56 +00:00

28 lines
1.1 KiB
Text

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))