Re: [PATCH 3/3] tools/perf: build fixes for arch_errno_names.sh

[Ian Rogers]

On Thu, May 14, 2020 at 8:04 AM Arnaldo Carvalho de Melo
<arnaldo.melo@xxxxxxxxx> wrote:
>
> Em Thu, Mar 05, 2020 at 11:11:10PM -0800, Ian Rogers escreveu:
> > Allow the CC compiler to accept a CFLAGS environment variable.
> > Make the architecture test directory agree with the code comment.
> > This doesn't change the code generated but makes it easier to integrate
> > running the shell script in build systems like bazel.
>
> I've looked at this and split this part in a separate patch, and applied
> it locally, please take a look, now looking at the other bit of the
> patch.


This bit looks good. The CFLAGS change is something I need to deal
with a directory layout change in our build system.

Thanks,
Ian

> - Arnaldo
>
> > Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
> > ---
> >  tools/perf/trace/beauty/arch_errno_names.sh | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
> > index 22c9fc900c84..9f9ea45cddc4 100755
> > --- a/tools/perf/trace/beauty/arch_errno_names.sh
> > +++ b/tools/perf/trace/beauty/arch_errno_names.sh
> > @@ -91,7 +91,7 @@ EoHEADER
> >  # in tools/perf/arch
> >  archlist=""
> >  for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | grep -v x86 | sort); do
> > -     test -d arch/$arch && archlist="$archlist $arch"
> > +     test -d $toolsdir/perf/arch/$arch && archlist="$archlist $arch"
> >  done
> >
> >  for arch in x86 $archlist generic; do
> > --
> commit 1b59e3b7bfc6183d3dc9f119e1875f9607d29d96
> Author: Ian Rogers <irogers@xxxxxxxxxx>
> Date:   Thu Mar 5 23:11:10 2020 -0800
>
>     perf trace: Fix the selection for architectures to generate the errno name tables
>
>     Make the architecture test directory agree with the code comment.
>
>     Committer notes:
>
>     This was split from a larger patch.
>
>     The code was assuming the developer always worked from tools/perf/, so make sure we
>     do the test -d having $toolsdir/perf/arch/$arch, to match the intent expressed in the comment,
>     just above that loop.
>
>     Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
>     Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
>     Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
>     Cc: Alexios Zavras <alexios.zavras@xxxxxxxxx>
>     Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
>     Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>     Cc: Igor Lubashev <ilubashe@xxxxxxxxxx>
>     Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
>     Cc: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
>     Cc: Mark Rutland <mark.rutland@xxxxxxx>
>     Cc: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
>     Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
>     Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
>     Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
>     Cc: Stephane Eranian <eranian@xxxxxxxxxx>
>     Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
>     Cc: Wei Li <liwei391@xxxxxxxxxx>
>     Link: http://lore.kernel.org/lkml/20200306071110.130202-4-irogers@xxxxxxxxxx
>     Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
>
> diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
> index 22c9fc900c84..f8c44a85650b 100755
> --- a/tools/perf/trace/beauty/arch_errno_names.sh
> +++ b/tools/perf/trace/beauty/arch_errno_names.sh
> @@ -91,7 +91,7 @@ EoHEADER
>  # in tools/perf/arch
>  archlist=""
>  for arch in $(find $toolsdir/arch -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | grep -v x86 | sort); do
> -       test -d arch/$arch && archlist="$archlist $arch"
> +       test -d $toolsdir/perf/arch/$arch && archlist="$archlist $arch"
>  done
>
>  for arch in x86 $archlist generic; do