From owner-svn-ports-all@freebsd.org Sun Feb 7 08:28:32 2021 Return-Path: Delivered-To: svn-ports-all@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 0F4874FCFEF; Sun, 7 Feb 2021 08:28:32 +0000 (UTC) (envelope-from mikael@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DYMk75sdGz3stm; Sun, 7 Feb 2021 08:28:31 +0000 (UTC) (envelope-from mikael@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 BCBBF2122B; Sun, 7 Feb 2021 08:28:31 +0000 (UTC) (envelope-from mikael@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1178SVrw074851; Sun, 7 Feb 2021 08:28:31 GMT (envelope-from mikael@FreeBSD.org) Received: (from mikael@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1178SVwi074850; Sun, 7 Feb 2021 08:28:31 GMT (envelope-from mikael@FreeBSD.org) Message-Id: <202102070828.1178SVwi074850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mikael set sender to mikael@FreeBSD.org using -f From: Mikael Urankar Date: Sun, 7 Feb 2021 08:28:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564607 - head/www/chromium/files X-SVN-Group: ports-head X-SVN-Commit-Author: mikael X-SVN-Commit-Paths: head/www/chromium/files X-SVN-Commit-Revision: 564607 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2021 08:28:32 -0000 Author: mikael Date: Sun Feb 7 08:28:31 2021 New Revision: 564607 URL: https://svnweb.freebsd.org/changeset/ports/564607 Log: www/chromium: Fix build on aarch64 PR: 246982 Approved by: portmgr (tier-2 blanket) Added: head/www/chromium/files/patch-third__party_zlib_BUILD.gn (contents, props changed) Modified: head/www/chromium/files/patch-third__party_zlib_cpu__features.c Added: head/www/chromium/files/patch-third__party_zlib_BUILD.gn ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third__party_zlib_BUILD.gn Sun Feb 7 08:28:31 2021 (r564607) @@ -0,0 +1,11 @@ +--- third_party/zlib/BUILD.gn.orig 2020-11-09 14:36:38 UTC ++++ third_party/zlib/BUILD.gn +@@ -88,6 +88,8 @@ if (use_arm_neon_optimizations) { + defines = [ "CRC32_ARMV8_CRC32" ] + if (is_android) { + defines += [ "ARMV8_OS_ANDROID" ] ++ } else if (is_bsd) { ++ defines += [ "ARMV8_OS_FREEBSD" ] + } else if (is_linux || is_chromeos) { + defines += [ "ARMV8_OS_LINUX" ] + } else if (is_mac) { Modified: head/www/chromium/files/patch-third__party_zlib_cpu__features.c ============================================================================== --- head/www/chromium/files/patch-third__party_zlib_cpu__features.c Sun Feb 7 06:34:07 2021 (r564606) +++ head/www/chromium/files/patch-third__party_zlib_cpu__features.c Sun Feb 7 08:28:31 2021 (r564607) @@ -1,5 +1,6 @@ ---- third_party/zlib/cpu_features.c.orig 2020-11-13 06:37:04 UTC +--- third_party/zlib/cpu_features.c.orig 2020-07-07 21:58:18 UTC +++ third_party/zlib/cpu_features.c + @@ -31,11 +31,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; #ifndef CPU_NO_SIMD @@ -23,6 +24,15 @@ #include #elif defined(ARMV8_OS_LINUX) #include +@@ -56,7 +65,7 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; + static void _cpu_check_features(void); + #endif + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_FREEBSD) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_MACOS) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) + #if !defined(ARMV8_OS_MACOS) + // _cpu_check_features() doesn't need to do anything on mac/arm since all + // features are known at build time, so don't call it. @@ -123,6 +132,13 @@ static void _cpu_check_features(void) #elif defined(ARMV8_OS_WINDOWS) arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE);