Attachment 215287 Details for Bug 246982 – patch

[patch] patch

chrom.diff (text/plain), 4.17 KB, created by Mikael Urankar on 2020-06-06 07:39:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2020-06-06 07:39:14 UTC

Size: 4.17 KB

patch

obsolete

>Index: www/chromium/files/patch-third__party_zlib_BUILD.gn
>===================================================================
>--- www/chromium/files/patch-third__party_zlib_BUILD.gn	(nonexistent)
>+++ www/chromium/files/patch-third__party_zlib_BUILD.gn	(working copy)
>@@ -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" ]
>
>Property changes on: www/chromium/files/patch-third__party_zlib_BUILD.gn
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: www/chromium/files/patch-third_party_zlib_cpu__features.c
>===================================================================
>--- www/chromium/files/patch-third_party_zlib_cpu__features.c	(nonexistent)
>+++ www/chromium/files/patch-third_party_zlib_cpu__features.c	(working copy)
>@@ -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
>
>Property changes on: www/chromium/files/patch-third_party_zlib_cpu__features.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 246982: 215287