Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Sender: Namhyung Kim <namhyung@gmail.com>
From:   Namhyung Kim <namhyung@kernel.org>
To:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>
Cc:     Ian Rogers <irogers@google.com>,
        Adrian Hunter <adrian.hunter@intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        linux-perf-users@vger.kernel.org,
        Andres Freund <andres@anarazel.de>,
        Sedat Dilek <sedat.dilek@gmail.com>,
        Roberto Sassu <roberto.sassu@huawei.com>
Subject: [BUG] perf build: fail with BUILD_NONDISTRO=1 FEATURES_DUMP=...
Date:   Mon, 26 Jun 2023 23:30:30 -0700
Message-ID: <20230627063046.548573-1-namhyung@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Hello,

I'm having a failure during `make build-test` in the perf tree.
It calls make BUILD_NONDISTRO=1 with FEATURES_DUMP defined.
Building with BUILD_NONDISTRO=1 alone was fine but it fails when I
define the FEATURES_DUMP too.

  $ make build-test
            make_nondistro_O: cd . && make BUILD_NONDISTRO=1 \
		FEATURES_DUMP=./BUILD_TEST_FEATURE_DUMP -j64 \
		O=/tmp/tmp.6JwPK1xbWG DESTDIR=/tmp/tmp.sWSewBwO13
  ...
    CC      util/annotate.o
  In file included from util/annotate.c:1814:
  tools/include/tools/dis-asm-compat.h:10:6: error: redeclaration of ‘enum disassembler_style’
     10 | enum disassembler_style {DISASSEMBLER_STYLE_NOT_EMPTY};
        |      ^~~~~~~~~~~~~~~~~~
  In file included from util/annotate.c:1809:
  /usr/include/dis-asm.h:53:6: note: originally defined here
     53 | enum disassembler_style
        |      ^~~~~~~~~~~~~~~~~~
  tools/include/tools/dis-asm-compat.h: In function ‘init_disassemble_info_compat’:
  tools/include/tools/dis-asm-compat.h:50:9: error: too few arguments to function ‘init_disassemble_info’
     50 |         init_disassemble_info(info, stream,
        |         ^~~~~~~~~~~~~~~~~~~~~
  /usr/include/dis-asm.h:480:13: note: declared here
    480 | extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream,
        |             ^~~~~~~~~~~~~~~~~~~~~
  util/annotate.c: In function ‘symbol__disassemble_bpf’:
  util/annotate.c:1896:36: error: incompatible type for argument 1 of ‘disassembler’
   1896 |         disassemble = disassembler(bfdf);
        |                                    ^~~~
        |                                    |
        |                                    bfd *
  /usr/include/dis-asm.h:409:63: note: expected ‘enum bfd_architecture’ but argument is of type ‘bfd *’
    409 | extern disassembler_ftype disassembler (enum bfd_architecture arc,
        |                                         ~~~~~~~~~~~~~~~~~~~~~~^~~
  util/annotate.c:1896:23: error: too few arguments to function ‘disassembler’
   1896 |         disassemble = disassembler(bfdf);
        |                       ^~~~~~~~~~~~
  /usr/include/dis-asm.h:409:27: note: declared here
    409 | extern disassembler_ftype disassembler (enum bfd_architecture arc,
        |                           ^~~~~~~~~~~~


Thanks,
Namhyung


Cc: Andres Freund <andres@anarazel.de>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Roberto Sassu <roberto.sassu@huawei.com>