From ec341b21d1511ccdfb467f24f90dca87179b78d9 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 3 Jun 2017 10:06:10 +0000 Subject: [PATCH] Fix build on armv6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: 216735 Submitted by: Mikaël Urankar --- lang/qt5-qml/Makefile | 1 + ...h-src_3rdparty_masm_assembler_ARMAssembler.h | 11 +++++++++++ ...src_3rdparty_masm_assembler_ARMv7Assembler.h | 11 +++++++++++ .../patch-src_3rdparty_masm_wtf_Platform.h | 17 +++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h create mode 100644 lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h create mode 100644 lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h diff --git a/lang/qt5-qml/Makefile b/lang/qt5-qml/Makefile index 93fef9eb3199..e51f7fcb9d5e 100644 --- a/lang/qt5-qml/Makefile +++ b/lang/qt5-qml/Makefile @@ -2,6 +2,7 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- diff --git a/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h b/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h new file mode 100644 index 000000000000..0790f74f2b50 --- /dev/null +++ b/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h @@ -0,0 +1,11 @@ +--- src/3rdparty/masm/assembler/ARMAssembler.h.orig 2017-02-02 10:26:18 UTC ++++ src/3rdparty/masm/assembler/ARMAssembler.h +@@ -1069,6 +1069,8 @@ namespace JSC { + UNUSED_PARAM(size); + #elif OS(QNX) + msync(code, size, MS_INVALIDATE_ICACHE); ++#elif OS(FREEBSD) && COMPILER(CLANG) ++ __clear_cache(code, reinterpret_cast(code) + size); + #else + #error "The cacheFlush support is missing on this platform." + #endif diff --git a/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h b/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h new file mode 100644 index 000000000000..47e8fb45c14b --- /dev/null +++ b/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h @@ -0,0 +1,11 @@ +--- src/3rdparty/masm/assembler/ARMv7Assembler.h.orig 2016-09-12 04:21:49 UTC ++++ src/3rdparty/masm/assembler/ARMv7Assembler.h +@@ -2311,6 +2311,8 @@ public: + UNUSED_PARAM(code); + UNUSED_PARAM(size); + #endif ++#elif OS(FREEBSD) && COMPILER(CLANG) ++ __clear_cache(code, reinterpret_cast(code) + size); + #else + #error "The cacheFlush support is missing on this platform." + #endif diff --git a/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h b/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h new file mode 100644 index 000000000000..d92e37e2d169 --- /dev/null +++ b/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h @@ -0,0 +1,17 @@ +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/masm/wtf/Platform.h.orig 2017-02-02 09:31:51 UTC ++++ src/3rdparty/masm/wtf/Platform.h +@@ -211,6 +211,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__) \