svn commit: r484641 - in head/x11-toolkits/qt5-declarative: . files
Tobias C. Berner
tcberner at FreeBSD.org
Sat Nov 10 19:57:36 UTC 2018
Author: tcberner
Date: Sat Nov 10 19:57:33 2018
New Revision: 484641
URL: https://svnweb.freebsd.org/changeset/ports/484641
Log:
x11-toolkits/qt5-declarative
- readd patches for ARM support that got lost in r484140.
PR: 233111
Reported by: jbeich
Pointy hat: tcberner
Added:
head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h
- copied unchanged from r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h
head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h
- copied unchanged from r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h
head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h
- copied unchanged from r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h
head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_wtf_Platform.h
- copied unchanged from r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h
Modified:
head/x11-toolkits/qt5-declarative/Makefile
Modified: head/x11-toolkits/qt5-declarative/Makefile
==============================================================================
--- head/x11-toolkits/qt5-declarative/Makefile Sat Nov 10 19:57:07 2018 (r484640)
+++ head/x11-toolkits/qt5-declarative/Makefile Sat Nov 10 19:57:33 2018 (r484641)
@@ -2,6 +2,7 @@
PORTNAME= declarative
DISTVERSION= ${QT5_VERSION}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
Copied: head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h (from r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h Sat Nov 10 19:57:33 2018 (r484641, copy of r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARM64Assembler.h)
@@ -0,0 +1,11 @@
+--- src/3rdparty/masm/assembler/ARM64Assembler.h.orig 2018-06-15 11:30:15 UTC
++++ src/3rdparty/masm/assembler/ARM64Assembler.h
+@@ -3036,6 +3036,8 @@ class ARM64Assembler { (public)
+ linuxPageFlush(current, current + page);
+
+ linuxPageFlush(current, end);
++#elif OS(FREEBSD)
++ __clear_cache(code, reinterpret_cast<char*>(code) + size);
+ #elif OS(QNX)
+ #if !ENABLE(ASSEMBLER_WX_EXCLUSIVE)
+ msync(code, size, MS_INVALIDATE_ICACHE);
Copied: head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h (from r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARMAssembler.h Sat Nov 10 19:57:33 2018 (r484641, copy of r484139, head/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<char*>(code) + size);
+ #else
+ #error "The cacheFlush support is missing on this platform."
+ #endif
Copied: head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h (from r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h Sat Nov 10 19:57:33 2018 (r484641, copy of r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_assembler_ARMv7Assembler.h)
@@ -0,0 +1,11 @@
+--- src/3rdparty/masm/assembler/ARMv7Assembler.h.orig 2018-06-15 11:30:15 UTC
++++ src/3rdparty/masm/assembler/ARMv7Assembler.h
+@@ -2372,6 +2372,8 @@ class ARMv7Assembler { (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
Copied: head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_wtf_Platform.h (from r484139, head/lang/qt5-qml/files/patch-src_3rdparty_masm_wtf_Platform.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/qt5-declarative/files/patch-src_3rdparty_masm_wtf_Platform.h Sat Nov 10 19:57:33 2018 (r484641, copy of r484139, head/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 2018-06-15 11:30:15 UTC
++++ src/3rdparty/masm/wtf/Platform.h
+@@ -221,6 +221,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__) \
More information about the svn-ports-all
mailing list