From owner-svn-ports-head@freebsd.org Sat Nov 10 19:57:35 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCCF51108D49; Sat, 10 Nov 2018 19:57:35 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2F3679930; Sat, 10 Nov 2018 19:57:34 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D5AFE277F4; Sat, 10 Nov 2018 19:57:34 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAAJvYKN038421; Sat, 10 Nov 2018 19:57:34 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAAJvXUL038413; Sat, 10 Nov 2018 19:57:33 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201811101957.wAAJvXUL038413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 10 Nov 2018 19:57:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484641 - in head/x11-toolkits/qt5-declarative: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/x11-toolkits/qt5-declarative: . files X-SVN-Commit-Revision: 484641 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F2F3679930 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.89), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Nov 2018 19:57:36 -0000 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(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(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(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__) \