svn commit: r528672 - head/www/cliqz/files

[Santhosh Raju]

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 <machine/armreg.h>
++    #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;