Changeset View
Changeset View
Standalone View
Standalone View
devel/qt4-corelib/files/patch-fixup_arm6_arch
- This file was added.
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| 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/corelib/arch/qatomic_arm.h.orig 2016-10-22 07:27:45 UTC | |||||
| +++ src/corelib/arch/qatomic_arm.h | |||||
| @@ -57,7 +57,7 @@ QT_END_INCLUDE_HEADER | |||||
| || defined(__ARM_ARCH_6T2__) \ | |||||
| || defined(__ARM_ARCH_6Z__) \ | |||||
| || defined(__ARM_ARCH_6K__) \ | |||||
| - || defined(__ARM_ARCH_6ZK__) \ | |||||
| + || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6KZ__) \ | |||||
| || defined(__ARM_ARCH_6M__) \ | |||||
| || (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6)) | |||||
| # define QT_ARCH_ARMV6 | |||||
| --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2016-10-22 07:29:02 UTC | |||||
| +++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | |||||
| @@ -255,7 +255,7 @@ | |||||
| || defined(__ARM_ARCH_6J__) \ | |||||
| || defined(__ARM_ARCH_6K__) \ | |||||
| || defined(__ARM_ARCH_6Z__) \ | |||||
| - || defined(__ARM_ARCH_6ZK__) \ | |||||
| + || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6KZ__) \ | |||||
| || defined(__ARM_ARCH_6T2__) \ | |||||
| || defined(__ARMV6__) | |||||
| #define WTF_ARM_ARCH_VERSION 6 | |||||
| @@ -285,7 +285,7 @@ | |||||
| #elif defined(__ARM_ARCH_6J__) \ | |||||
| || defined(__ARM_ARCH_6K__) \ | |||||
| || defined(__ARM_ARCH_6Z__) \ | |||||
| - || defined(__ARM_ARCH_6ZK__) \ | |||||
| + || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6KZ__) \ | |||||
| || defined(__ARM_ARCH_6M__) | |||||
| #define WTF_THUMB_ARCH_VERSION 3 | |||||