Date: Mon, 8 Jul 2024 20:25:56 +0100 From: Nuno Teixeira <eduardo@freebsd.org> To: Christoph Moench-Tegeder <cmt@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 8565550e2557 - main - www/firefox: drop obsolete patch Message-ID: <CAFDf7UL78XbRsyPpN4uN9XqEbc%2B7Q9B04wbJeSb6UriMhxtbpw@mail.gmail.com> In-Reply-To: <202407072130.467LUGIk073494@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Hello Christoph, Build and runs fine! Thanks, Christoph Moench-Tegeder <cmt@freebsd.org> escreveu (domingo, 7/07/2024 à(s) 22:30): > The branch main has been updated by cmt: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=8565550e2557fc339bb8e10f0197c6de36a154d1 > > commit 8565550e2557fc339bb8e10f0197c6de36a154d1 > Author: Christoph Moench-Tegeder <cmt@FreeBSD.org> > AuthorDate: 2024-07-07 21:26:01 +0000 > Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org> > CommitDate: 2024-07-07 21:26:01 +0000 > > www/firefox: drop obsolete patch > > In Skia m125 all extra ARM feature detection was removed > (ref skia 571b4cf2e359), so we do not have to roll our own. > This also should fix built on ARM, which was failing over > the detection of native CRC32 instructions (which are not used > anymore by Skia, and whose dis-use triggered the whole feature > detection removal) > > Reported by: eduardo@ > --- > .../files/patch-gfx_skia_skia_src_core_SkCpu.cpp | 33 > ---------------------- > 1 file changed, 33 deletions(-) > > 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 > deleted file mode 100644 > index fe73016d6618..000000000000 > --- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp > +++ /dev/null > @@ -1,33 +0,0 @@ > -Regressed by https://svnweb.freebsd.org/changeset/base/324815 > - > -gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared > identifier 'getauxval' > - uint32_t hwcaps = getauxval(AT_HWCAP); > - ^ > - > -diff --git gfx/skia/skia/src/core/SkCpu.cpp > gfx/skia/skia/src/core/SkCpu.cpp > -index cdac7db2be2c..88391138880a 100644 > ---- gfx/skia/skia/src/core/SkCpu.cpp > -+++ gfx/skia/skia/src/core/SkCpu.cpp > -@@ -81,6 +81,22 @@ > - if (hwcap & HWCAP_LOONGARCH_LSX) { features |= > SkCpu::LOONGARCH_SX; } > - if (hwcap & HWCAP_LOONGARCH_LASX) { features |= > SkCpu::LOONGARCH_ASX; } > - > -+ 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_VAL(id_aa64isar0) == > ID_AA64ISAR0_CRC32_BASE) { > -+ features |= SkCpu::CRC32; > -+ } > - return features; > - } > - #else > -- Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org [-- Attachment #2 --] <div dir="ltr"><div>Hello Christoph,</div><div><br></div><div>Build and runs fine!</div><div><br></div><div>Thanks,<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Christoph Moench-Tegeder <<a href="mailto:cmt@freebsd.org">cmt@freebsd.org</a>> escreveu (domingo, 7/07/2024 à(s) 22:30):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by cmt:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=8565550e2557fc339bb8e10f0197c6de36a154d1" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=8565550e2557fc339bb8e10f0197c6de36a154d1</a><br>; <br> commit 8565550e2557fc339bb8e10f0197c6de36a154d1<br> Author: Christoph Moench-Tegeder <cmt@FreeBSD.org><br> AuthorDate: 2024-07-07 21:26:01 +0000<br> Commit: Christoph Moench-Tegeder <cmt@FreeBSD.org><br> CommitDate: 2024-07-07 21:26:01 +0000<br> <br> www/firefox: drop obsolete patch<br> <br> In Skia m125 all extra ARM feature detection was removed<br> (ref skia 571b4cf2e359), so we do not have to roll our own.<br> This also should fix built on ARM, which was failing over<br> the detection of native CRC32 instructions (which are not used<br> anymore by Skia, and whose dis-use triggered the whole feature<br> detection removal)<br> <br> Reported by: eduardo@<br> ---<br> .../files/patch-gfx_skia_skia_src_core_SkCpu.cpp | 33 ----------------------<br> 1 file changed, 33 deletions(-)<br> <br> 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<br> deleted file mode 100644<br> index fe73016d6618..000000000000<br> --- a/www/firefox/files/patch-gfx_skia_skia_src_core_SkCpu.cpp<br> +++ /dev/null<br> @@ -1,33 +0,0 @@<br> -Regressed by <a href="https://svnweb.freebsd.org/changeset/base/324815" rel="noreferrer" target="_blank">https://svnweb.freebsd.org/changeset/base/324815</a><br>; -<br> -gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifier 'getauxval'<br> - uint32_t hwcaps = getauxval(AT_HWCAP);<br> - ^<br> -<br> -diff --git gfx/skia/skia/src/core/SkCpu.cpp gfx/skia/skia/src/core/SkCpu.cpp<br> -index cdac7db2be2c..88391138880a 100644<br> ---- gfx/skia/skia/src/core/SkCpu.cpp<br> -+++ gfx/skia/skia/src/core/SkCpu.cpp<br> -@@ -81,6 +81,22 @@<br> - if (hwcap & HWCAP_LOONGARCH_LSX) { features |= SkCpu::LOONGARCH_SX; }<br> - if (hwcap & HWCAP_LOONGARCH_LASX) { features |= SkCpu::LOONGARCH_ASX; }<br> - <br> -+ return features;<br> -+ }<br> -+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)<br> -+ #include <machine/armreg.h><br> -+ #ifndef ID_AA64ISAR0_CRC32_VAL<br> -+ #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32<br> -+ #endif<br> -+<br> -+ static uint32_t read_cpu_features() {<br> -+ uint32_t features = 0;<br> -+ uint64_t id_aa64isar0;<br> -+<br> -+ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1);<br> -+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) {<br> -+ features |= SkCpu::CRC32;<br> -+ }<br> - return features;<br> - }<br> - #else<br> </blockquote></div><br clear="all"><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888"> FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div>;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UL78XbRsyPpN4uN9XqEbc%2B7Q9B04wbJeSb6UriMhxtbpw>