svn commit: r564607 - head/www/chromium/files

[Mikael Urankar]

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 <cpu-features.h>
  #elif defined(ARMV8_OS_LINUX)
  #include <asm/hwcap.h>
+@@ -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);