Attachment 239258 Details for Bug 268750 – www/firefox: draft patch to fix build on armv7

[patch] www/firefox: draft patch to fix build on armv7

0002-www-firefox-fix-build-on-armv7.patch (text/plain), 1.97 KB, created by Robert Clausecker on 2023-01-04 11:54:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2023-01-04 11:54:45 UTC

Size: 1.97 KB

patch

obsolete

>From caa1828dd37707f9302fe61abe423331b72f0075 Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Tue, 3 Jan 2023 11:34:05 +0100
>Subject: [PATCH 2/2] www/firefox: fix build on armv7
>
>Still doesn't build due to rust toolchain oom
>---
> .../patch-gfx_skia_skia_src_core_SkCpu.cpp    | 27 ++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
>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 0cee5dac92a1..14f8fe008933 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,7 +4,7 @@ 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	2020-02-07 22:13:22 UTC
>+--- gfx/skia/skia/src/core/SkCpu.cpp.orig	2022-11-10 18:21:50 UTC
> +++ gfx/skia/skia/src/core/SkCpu.cpp
> @@ -72,6 +72,23 @@
>          return features;
>@@ -30,3 +30,28 @@ gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'get
>  #elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
>      #include <sys/auxv.h>
>  
>+@@ -114,6 +131,24 @@
>+         return features;
>+     }
>+ 
>++#elif (SK_CPU_ARM32) && defined(__FreeBSD__)
>++    #include <sys/auxv.h>
>++
>++    static uint32_t read_cpu_features() {
>++        unsigned long caps = 0;
>++        uint32_t features = 0;
>++
>++        elf_aux_info(AT_HWCAP, &caps, sizeof caps);
>++
>++        if (caps & HWCAP_NEON) {
>++            features |= SkCpu::NEON;
>++            if (caps & HWCAP_VFPv4) {
>++                features |= SkCpu::NEON_FMA|SkCpu::VFP_FP16;
>++            }
>++        }
>++
>++        return features;
>++    }
>+ #elif defined(SK_CPU_ARM32) && __has_include(<sys/auxv.h>) && \
>+     (!defined(__ANDROID_API__) || __ANDROID_API__ >= 18)
>+     // sys/auxv.h will always be present in the Android NDK due to unified
>-- 
>2.38.1
>

Actions: View | Diff

Attachments on bug 268750: 239258