1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-31 10:46:16 +00:00

Fix build on armv6

PR:		216735
Submitted by:	Mikaël Urankar <mikael.urankar at gmail.com>
This commit is contained in:
Tobias C. Berner 2017-06-03 10:06:10 +00:00
parent 478caad0cd
commit ec341b21d1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=442470
4 changed files with 40 additions and 0 deletions

View File

@ -2,6 +2,7 @@
PORTNAME= qml
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= lang
PKGNAMEPREFIX= qt5-

View File

@ -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<char*>(code) + size);
#else
#error "The cacheFlush support is missing on this platform."
#endif

View File

@ -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<char*>(code) + size);
#else
#error "The cacheFlush support is missing on this platform."
#endif

View File

@ -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__) \