[FFmpeg-devel] [PATCH] libavutil/ppc/cpu.c: check that AT_HWCAP2 is defined

[Sean McGovern]

Hi,


On Thu, Oct 19, 2023, 07:44 Michael Niedermayer <michael at niedermayer.cc>
wrote:

> On Wed, Oct 18, 2023 at 01:18:54PM -0400, Sean McGovern wrote:
> > On Sat, Oct 14, 2023, 23:27 Sean McGovern <gseanmcg at gmail.com> wrote:
> >
> > > It was not introduced until glibc 2.18.
> > > ---
> > > This should fix the ppc32 FATE node.
> > > ---
> > >  libavutil/ppc/cpu.c | 5 ++++-
> > >  1 file changed, 4 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/libavutil/ppc/cpu.c b/libavutil/ppc/cpu.c
> > > index 96b491c716..bc8bb5f47c 100644
> > > --- a/libavutil/ppc/cpu.c
> > > +++ b/libavutil/ppc/cpu.c
> > > @@ -95,12 +95,15 @@ int ff_get_cpu_flags_ppc(void)
> > >  #endif
> > >                  if (ret & AV_CPU_FLAG_VSX)
> > >                      av_assert0(ret & AV_CPU_FLAG_ALTIVEC);
> > > -            } else if (buf[i] == AT_HWCAP2) {
> > > +            }
> > > +#ifdef AT_HWCAP2 /* not introduced until glibc 2.18 */
> > > +            else if (buf[i] == AT_HWCAP2) {
> > >  #ifdef PPC_FEATURE2_ARCH_2_07
> > >                  if (buf[i + 1] & PPC_FEATURE2_ARCH_2_07)
> > >                      ret |= AV_CPU_FLAG_POWER8;
> > >  #endif
> > >              }
> > > +#endif /* AT_HWCAP2 */
> > >          }
> > >      }
> > >
> > > --
> > > 2.39.2
> > >
> >
> > Ping review.
>
> will apply with my next push to master
>
>
> >
> > Alternatively, can the ppc32 FATE nodes be upgraded to a distribution
> > release with glibc 2.18 or higher?
>
> > Can I assist with that somehow?
>
> If you want, you can run a fate client to replace or augment the old one.
> for this sent the public ssh key the cleint will use to fate-admin (email
> addr
> should be in the docs)
>
> thx
> [...]
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
>
Just a quick update: I have not forgot about this. I'm still in the middle
of converting my workstation to running Linux natively instead of as a VM.
Stay tuned!

-- Sean McGovern