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

Arnaldo Carvalho de Melo
2020-05-15T13:57:43Z

Em Thu, May 14, 2020 at 10:54:49AM -0700, Ian Rogers escreveu:
> On Thu, May 14, 2020 at 8:04 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.
> >
> > 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.

I added that one as well, as a separate patch, this one:

commit 6e136ceba23c087b1e1b846914e425706d492a3a
Author: Ian Rogers <irogers@google.com>
Date: Thu Mar 5 23:11:10 2020 -0800

perf beauty: Allow the CC used in the arch errno names script to acccept CFLAGS

Allow the CC compiler to accept a CFLAGS environment variable. This
doesn't change the code generated but makes it easier to integrate
running the shell script in build systems like bazel.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexios Zavras <alexios.zavras@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Igor Lubashev <ilubashe@akamai.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Li <liwei391@huawei.com>
Link: http://lore.kernel.org/lkml/20200306071110.130202-4-irogers@google.com
[ split from a larger patch ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/trace/beauty/arch_errno_names.sh b/tools/perf/trace/beauty/arch_errno_names.sh
index f8c44a85650b..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 \