Date: Wed, 10 Jun 2020 18:23:24 +0000 (UTC) From: Mikael Urankar <mikael@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538423 - head/www/chromium/files Message-ID: <202006101823.05AINOXB068356@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mikael Date: Wed Jun 10 18:23:24 2020 New Revision: 538423 URL: https://svnweb.freebsd.org/changeset/ports/538423 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) head/www/chromium/files/patch-third_party_zlib_cpu__features.c (contents, props changed) 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 Wed Jun 10 18:23:24 2020 (r538423) @@ -0,0 +1,20 @@ +--- third_party/zlib/BUILD.gn.orig 2020-05-18 20:40:28 UTC ++++ third_party/zlib/BUILD.gn +@@ -82,6 +82,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_fuchsia) { +@@ -350,7 +352,7 @@ static_library("minizip") { + ] + } + +- if (is_mac || is_ios || is_android || is_nacl) { ++ if (is_mac || is_ios || is_android || is_nacl || is_bsd) { + # Mac, Android and the BSDs don't have fopen64, ftello64, or fseeko64. We + # use fopen, ftell, and fseek instead on these systems. + defines = [ "USE_FILE32API" ] Added: head/www/chromium/files/patch-third_party_zlib_cpu__features.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chromium/files/patch-third_party_zlib_cpu__features.c Wed Jun 10 18:23:24 2020 (r538423) @@ -0,0 +1,55 @@ +--- third_party/zlib/cpu_features.c.orig 2020-05-18 20:40:28 UTC ++++ third_party/zlib/cpu_features.c +@@ -24,11 +24,20 @@ int ZLIB_INTERNAL x86_cpu_enable_simd = 0; + + #ifndef CPU_NO_SIMD + +-#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(ARMV8_OS_FREEBSD) + #include <pthread.h> + #endif + +-#if defined(ARMV8_OS_ANDROID) ++#if defined(ARMV8_OS_FREEBSD) ++#include <machine/armreg.h> ++#include <sys/types.h> ++#ifndef ID_AA64ISAR0_AES_VAL ++#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES ++#endif ++#ifndef ID_AA64ISAR0_CRC32_VAL ++#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 ++#endif ++#elif defined(ARMV8_OS_ANDROID) + #include <cpu-features.h> + #elif defined(ARMV8_OS_LINUX) + #include <asm/hwcap.h> +@@ -49,7 +58,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_FUCHSIA) || defined(X86_NOT_WINDOWS) ++#if defined(ARMV8_OS_ANDROID) || defined(ARMV8_OS_LINUX) || defined(ARMV8_OS_FUCHSIA) || defined(X86_NOT_WINDOWS) || defined(ARMV8_OS_FREEBSD) + static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT; + void ZLIB_INTERNAL cpu_check_features(void) + { +@@ -108,6 +117,13 @@ static void _cpu_check_features(void) + #elif defined(ARMV8_OS_WINDOWS) + arm_cpu_enable_crc32 = IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE); + arm_cpu_enable_pmull = IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE); ++#elif defined(ARMV8_OS_FREEBSD) ++ uint64_t id_aa64isar0; ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) ++ arm_cpu_enable_pmull = 1; ++ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) ++ arm_cpu_enable_crc32 = 1; + #endif + } + #endif +@@ -145,4 +161,4 @@ static void _cpu_check_features(void) + } + #endif + #endif +-#endif +\ No newline at end of file ++#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006101823.05AINOXB068356>