svn commit: r529979 - in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files

[Mikael Urankar]

Author: mikael
Date: Tue Mar 31 15:13:15 2020
New Revision: 529979
URL: https://svnweb.freebsd.org/changeset/ports/529979

Log:
  www/firefox: fix build on aarch64
  
  The interface has changed a bit on -current:
  
  In file included from Unified_cpp_gfx_skia1.cpp:137:
  /wrkdirs/usr/ports/www/firefox/work/firefox-71.0/gfx/skia/skia/src/core/SkCpu.cpp:81:13: error: use of undeclared identifier 'ID_AA64ISAR0_CRC32'
          if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) {
  
  PR:		243653
  Reviewed by:	jbeich
  Approved by:	jbeich , manu (mentor, implicit)

Modified:
  head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
  head/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
  head/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp

Modified: head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
==============================================================================
--- head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp	Tue Mar 31 15:01:10 2020	(r529978)
+++ head/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp	Tue Mar 31 15:13:15 2020	(r529979)
@@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of 
         uint32_t hwcaps = getauxval(AT_HWCAP);
                           ^
 
---- gfx/skia/skia/src/core/SkCpu.cpp.orig	2019-02-27 22:18:23 UTC
+--- gfx/skia/skia/src/core/SkCpu.cpp.orig	2020-02-10 09:43:20 UTC
 +++ gfx/skia/skia/src/core/SkCpu.cpp
-@@ -70,6 +70,20 @@
+@@ -70,6 +70,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;

Modified: head/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
==============================================================================
--- head/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp	Tue Mar 31 15:01:10 2020	(r529978)
+++ head/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp	Tue Mar 31 15:13:15 2020	(r529979)
@@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of 
         uint32_t hwcaps = getauxval(AT_HWCAP);
                           ^
 
---- gfx/skia/skia/src/core/SkCpu.cpp.orig	2019-02-27 22:18:23 UTC
+--- gfx/skia/skia/src/core/SkCpu.cpp.orig	2020-02-07 01:27:03 UTC
 +++ gfx/skia/skia/src/core/SkCpu.cpp
-@@ -70,6 +70,20 @@
+@@ -70,6 +70,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;

Modified: head/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp
==============================================================================
--- head/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp	Tue Mar 31 15:01:10 2020	(r529978)
+++ head/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp	Tue Mar 31 15:13:15 2020	(r529979)
@@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of 
         uint32_t hwcaps = getauxval(AT_HWCAP);
                           ^
 
---- gfx/skia/skia/src/core/SkCpu.cpp.orig	2019-02-27 22:18:23 UTC
+--- gfx/skia/skia/src/core/SkCpu.cpp.orig	2020-02-07 22:13:22 UTC
 +++ 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;