diff options
3 files changed, 21 insertions, 12 deletions
diff --git a/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp index 29604e85f690..2f603bb0ecab 100644 --- a/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp +++ b/mail/thunderbird/files/patch-gfx_skia_skia_src_core_SkCpu.cpp @@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'get 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; diff --git a/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp index 29604e85f690..595271cf1e30 100644 --- a/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp +++ b/www/firefox-esr/files/patch-gfx_skia_skia_src_core_SkCpu.cpp @@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'get 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; diff --git a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp index 29604e85f690..0cee5dac92a1 100644 --- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp +++ b/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp @@ -4,21 +4,24 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'get 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; |