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> References: <202407072130.467LUGIk073494@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000814110061cc1623d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Christoph, Build and runs fine! Thanks, Christoph Moench-Tegeder <cmt@freebsd.org> escreveu (domingo, 7/07/2024 =C3=A0(s) 22:30): > The branch main has been updated by cmt: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D8565550e2557fc339bb8e10f0197c= 6de36a154d1 > > 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 =3D 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 |=3D > SkCpu::LOONGARCH_SX; } > - if (hwcap & HWCAP_LOONGARCH_LASX) { features |=3D > 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 =3D 0; > -+ uint64_t id_aa64isar0; > -+ > -+ id_aa64isar0 =3D READ_SPECIALREG(id_aa64isar0_el1); > -+ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) =3D=3D > ID_AA64ISAR0_CRC32_BASE) { > -+ features |=3D SkCpu::CRC32; > -+ } > - return features; > - } > - #else > --=20 Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org --000000000000814110061cc1623d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div>Hello Christoph,</div><div><br></div><div>Build and r= uns fine!</div><div><br></div><div>Thanks,<br></div></div><br><div class=3D= "gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">Christoph Moench-Tegede= r <<a href=3D"mailto:cmt@freebsd.org">cmt@freebsd.org</a>> escreveu (= domingo, 7/07/2024 =C3=A0(s) 22:30):<br></div><blockquote class=3D"gmail_qu= ote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,20= 4);padding-left:1ex">The branch main has been updated by cmt:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D8565550e2557fc3= 39bb8e10f0197c6de36a154d1" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3D8565550e2557fc339bb8e10f0197c6de36a154d1</= a><br> <br> commit 8565550e2557fc339bb8e10f0197c6de36a154d1<br> Author:=C2=A0 =C2=A0 =C2=A0Christoph Moench-Tegeder <cmt@FreeBSD.org>= <br> AuthorDate: 2024-07-07 21:26:01 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Christoph Moench-Tegeder <cmt@FreeBSD.org>= <br> CommitDate: 2024-07-07 21:26:01 +0000<br> <br> =C2=A0 =C2=A0 www/firefox: drop obsolete patch<br> <br> =C2=A0 =C2=A0 In Skia m125 all extra ARM feature detection was removed<br> =C2=A0 =C2=A0 (ref skia 571b4cf2e359), so we do not have to roll our own.<b= r> =C2=A0 =C2=A0 This also should fix built on ARM, which was failing over<br> =C2=A0 =C2=A0 the detection of native CRC32 instructions (which are not use= d<br> =C2=A0 =C2=A0 anymore by Skia, and whose dis-use triggered the whole featur= e<br> =C2=A0 =C2=A0 detection removal)<br> <br> =C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 eduardo@<br> ---<br> =C2=A0.../files/patch-gfx_skia_skia_src_core_SkCpu.cpp=C2=A0 =C2=A0| 33 ---= -------------------<br> =C2=A01 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=3D"https://svnweb.freebsd.org/changeset/base/324815" = rel=3D"noreferrer" target=3D"_blank">https://svnweb.freebsd.org/changeset/b= ase/324815</a><br> -<br> -gfx/skia/skia/src/core/SkCpu.cpp:81:27: error: use of undeclared identifie= r 'getauxval'<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint32_t hwcaps =3D getauxval(AT_HWCAP);<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 ^<br> -<br> -diff --git gfx/skia/skia/src/core/SkCpu.cpp gfx/skia/skia/src/core/SkCpu.c= pp<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> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (hwcap & HWCAP_LOONGARCH_LSX)=C2= =A0 { features |=3D SkCpu::LOONGARCH_SX; }<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (hwcap & HWCAP_LOONGARCH_LASX) { = features |=3D SkCpu::LOONGARCH_ASX; }<br> - <br> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 return features;<br> -+=C2=A0 =C2=A0 }<br> -+#elif defined(SK_CPU_ARM64) && defined(__FreeBSD__)<br> -+=C2=A0 =C2=A0 #include <machine/armreg.h><br> -+=C2=A0 =C2=A0 #ifndef ID_AA64ISAR0_CRC32_VAL<br> -+=C2=A0 =C2=A0 #define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32<br> -+=C2=A0 =C2=A0 #endif<br> -+<br> -+=C2=A0 =C2=A0 static uint32_t read_cpu_features() {<br> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint32_t features =3D 0;<br> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 uint64_t id_aa64isar0;<br> -+<br> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 id_aa64isar0 =3D READ_SPECIALREG(id_aa64isar0= _el1);<br> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) =3D= =3D ID_AA64ISAR0_CRC32_BASE) {<br> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 features |=3D SkCpu::CRC32;<br> -+=C2=A0 =C2=A0 =C2=A0 =C2=A0 }<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return features;<br> -=C2=A0 =C2=A0 =C2=A0}<br> - #else<br> </blockquote></div><br clear=3D"all"><br><span class=3D"gmail_signature_pre= fix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div dir=3D"l= tr"><div><font color=3D"#888888">Nuno Teixeira</font></div><div><div><font = color=3D"#888888"> FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a h= ref=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://Fr= eeBSD.org</a><br></font></div></div></div></div> --000000000000814110061cc1623d--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7UL78XbRsyPpN4uN9XqEbc%2B7Q9B04wbJeSb6UriMhxtbpw>