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

Ian Rogers
2020-04-29T19:16:46Z

On Fri, Mar 6, 2020 at 3:40 AM Arnaldo Carvalho de Melo
<arnaldo.melo@gmail.com> 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.
>
> Hendrik and Thomas, can you please take a look at this and provide a
> Reviewed-by tag?

Ping.

> Thanks,
>
> - Arnaldo
>
> > Signed-off-by: Ian Rogers <irogers@google.com>
> > ---
> > 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
> > @@ -57,7 +57,7 @@ process_arch()
> > local arch="$1"
> > local asm_errno=$(asm_errno_file "$arch")
> >
> > - $gcc $include_path -E -dM -x c $asm_errno \
> > + $gcc $CFLAGS $include_path -E -dM -x c $asm_errno \
> > |grep -hE '^#define[[:blank:]]+(E[^[:blank:]]+)[[:blank:]]+([[:digit:]]+).*' \
> > |awk '{ print $2","$3; }' \
> > |sort -t, -k2 -nu \
> > @@ -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
> > --
> > 2.25.1.481.gfbce0eb801-goog
> >
>
> --
>
> - Arnaldo