[PATCH v1] perf pmu: Fix aarch64 build

[Arnaldo Carvalho de Melo]

Em Fri, Feb 03, 2023 at 11:36:30AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Fri, Feb 03, 2023 at 11:35:29AM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Fri, Feb 03, 2023 at 11:17:38AM -0300, Arnaldo Carvalho de Melo escreveu:
> > > Em Thu, Feb 02, 2023 at 05:41:22PM -0800, Ian Rogers escreveu:
> > > > On Thu, Feb 2, 2023 at 5:40 PM Ian Rogers <irogers at google.com> wrote:
> > > > >
> > > > > ARM64 overrides a weak function but a previous change had broken the
> > > > > build.
> > > > >
> > > > > Fixes: 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table")
> > > > 
> > > > As 8cefeb8bd336 ("perf pmu-events: Introduce pmu_metrics_table") is
> > > > only on tmp.perf/core then it may be best to just squash this fix into
> > > > that.
> > > 
> > > Yeah, that was my intention, I'll fold it there to keep bisection,
> > > thanks for fixing it so fast, I'll double check on my rk3399 board and
> > > on again on the cross-build container.
> > 
> > Nope, that is not what I reported yesterday, trying to build it on the
> > rk3399 board:
> 
> Sorry, pulled the trigger too soon, this is _before_ applying your fix,
> I should't multitask too much :-\
> 
> I'll double check now, 

Ok, now it is exploding at:

pmu-events/pmu-events.c: In function ‘decompress’:
pmu-events/pmu-events.c:3598:11: error: ‘struct pmu_event’ has no member named ‘metric_name’
 3598 |         pe->metric_name = (*p == '\0' ? NULL : p);
      |           ^~
pmu-events/pmu-events.c:3600:11: error: ‘struct pmu_event’ has no member named ‘metric_group’
 3600 |         pe->metric_group = (*p == '\0' ? NULL : p);
      |           ^~
pmu-events/pmu-events.c:3614:11: error: ‘struct pmu_event’ has no member named ‘metric_constraint’
 3614 |         pe->metric_constraint = (*p == '\0' ? NULL : p);
      |           ^~
pmu-events/pmu-events.c:3616:11: error: ‘struct pmu_event’ has no member named ‘metric_expr’
 3616 |         pe->metric_expr = (*p == '\0' ? NULL : p);
      |           ^~
pmu-events/pmu-events.c: At top level:
pmu-events/pmu-events.c:3637:32: error: no previous prototype for ‘perf_pmu__find_table’ [-Werror=missing-prototypes]
 3637 | const struct pmu_events_table *perf_pmu__find_table(struct perf_pmu *pmu)
      |                                ^~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[3]: *** [/home/acme/git/perf/tools/build/Makefile.build:98: /tmp/build/perf/pmu-events/pmu-events.o] Error 1
make[2]: *** [Makefile.perf:676: /tmp/build/perf/pmu-events/pmu-events-in.o] Error 2
make[2]: *** Waiting for unfinished jobs....
  CC      /tmp/build/perf/builtin-ftrace.o