From owner-svn-ports-head@freebsd.org Wed Mar 18 21:48:35 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DEC5426E467; Wed, 18 Mar 2020 21:48:35 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48jNvl1Vq3z3RL1; Wed, 18 Mar 2020 21:48:35 +0000 (UTC) (envelope-from fox@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 01012710; Wed, 18 Mar 2020 21:48:35 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02ILmYPh035884; Wed, 18 Mar 2020 21:48:34 GMT (envelope-from fox@FreeBSD.org) Received: (from fox@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02ILmY6J035882; Wed, 18 Mar 2020 21:48:34 GMT (envelope-from fox@FreeBSD.org) Message-Id: <202003182148.02ILmY6J035882@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fox set sender to fox@FreeBSD.org using -f From: Santhosh Raju Date: Wed, 18 Mar 2020 21:48:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528672 - head/www/cliqz/files X-SVN-Group: ports-head X-SVN-Commit-Author: fox X-SVN-Commit-Paths: head/www/cliqz/files X-SVN-Commit-Revision: 528672 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 18 Mar 2020 21:48:36 -0000 Author: fox Date: Wed Mar 18 21:48:34 2020 New Revision: 528672 URL: https://svnweb.freebsd.org/changeset/ports/528672 Log: www/cliqz: Fix build on aarch64 (CURRENT). PR: 244175 Submitted by: mikael@ Reported by: mikael@ Modified: head/www/cliqz/files/patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp Modified: head/www/cliqz/files/patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp ============================================================================== --- head/www/cliqz/files/patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp Wed Mar 18 21:04:32 2020 (r528671) +++ head/www/cliqz/files/patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp Wed Mar 18 21:48:34 2020 (r528672) @@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of uint32_t hwcaps = getauxval(AT_HWCAP); ^ ---- mozilla-release/gfx/skia/skia/src/core/SkCpu.cpp.orig 2019-02-27 22:18:23 UTC +--- mozilla-release/gfx/skia/skia/src/core/SkCpu.cpp.orig 2020-01-21 09:54:20 UTC +++ mozilla-release/gfx/skia/skia/src/core/SkCpu.cpp -@@ -70,6 +70,20 @@ +@@ -72,6 +72,23 @@ return features; } +#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__) + #include ++ #ifndef ID_AA64ISAR0_CRC32_VAL ++ #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 ++ #endif + + static uint32_t read_cpu_features() { + uint32_t features = 0; + uint64_t id_aa64isar0; + -+ id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1); -+ if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { + features |= SkCpu::CRC32; + } + return features;