linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andres Freund <andres@anarazel.de>
To: bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Alexei Starovoitov <ast@kernel.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Jiri Olsa <jolsa@kernel.org>, Sedat Dilek <sedat.dilek@gmail.com>,
	Quentin Monnet <quentin@isovalent.com>
Subject: [PATCH v2 1/5] tools build: add feature test for init_disassemble_info API changes
Date: Sun,  3 Jul 2022 14:25:47 -0700	[thread overview]
Message-ID: <20220703212551.1114923-2-andres@anarazel.de> (raw)
In-Reply-To: <20220703212551.1114923-1-andres@anarazel.de>

binutils changed the signature of init_disassemble_info(), which now causes
compilation failures for tools/{perf,bpf}, e.g. on debian unstable.
Relevant binutils commit:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07

This commit adds a feature test to detect the new signature.  Subsequent
commits will use it to fix the build failures.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Quentin Monnet <quentin@isovalent.com>
Link: http://lore.kernel.org/lkml/20220622181918.ykrs5rsnmx3og4sv@alap3.anarazel.de
Signed-off-by: Andres Freund <andres@anarazel.de>
---
 tools/build/Makefile.feature                        |  4 +++-
 tools/build/feature/Makefile                        |  4 ++++
 tools/build/feature/test-all.c                      |  4 ++++
 tools/build/feature/test-disassembler-init-styled.c | 13 +++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 tools/build/feature/test-disassembler-init-styled.c

diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
index 888a0421d43b..339686b99a6e 100644
--- a/tools/build/Makefile.feature
+++ b/tools/build/Makefile.feature
@@ -70,6 +70,7 @@ FEATURE_TESTS_BASIC :=                  \
         libaio				\
         libzstd				\
         disassembler-four-args		\
+        disassembler-init-styled	\
         file-handle
 
 # FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list
@@ -135,7 +136,8 @@ FEATURE_DISPLAY ?=              \
          bpf			\
          libaio			\
          libzstd		\
-         disassembler-four-args
+         disassembler-four-args	\
+         disassembler-init-styled
 
 # Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
 # If in the future we need per-feature checks/flags for features not
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index 7c2a17e23c30..c3059739318a 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -18,6 +18,7 @@ FILES=                                          \
          test-libbfd.bin                        \
          test-libbfd-buildid.bin		\
          test-disassembler-four-args.bin        \
+         test-disassembler-init-styled.bin	\
          test-reallocarray.bin			\
          test-libbfd-liberty.bin                \
          test-libbfd-liberty-z.bin              \
@@ -248,6 +249,9 @@ $(OUTPUT)test-libbfd-buildid.bin:
 $(OUTPUT)test-disassembler-four-args.bin:
 	$(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes
 
+$(OUTPUT)test-disassembler-init-styled.bin:
+	$(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes
+
 $(OUTPUT)test-reallocarray.bin:
 	$(BUILD)
 
diff --git a/tools/build/feature/test-all.c b/tools/build/feature/test-all.c
index 5ffafb967b6e..957c02c7b163 100644
--- a/tools/build/feature/test-all.c
+++ b/tools/build/feature/test-all.c
@@ -166,6 +166,10 @@
 # include "test-disassembler-four-args.c"
 #undef main
 
+#define main main_test_disassembler_init_styled
+# include "test-disassembler-init-styled.c"
+#undef main
+
 #define main main_test_libzstd
 # include "test-libzstd.c"
 #undef main
diff --git a/tools/build/feature/test-disassembler-init-styled.c b/tools/build/feature/test-disassembler-init-styled.c
new file mode 100644
index 000000000000..f1ce0ec3bee9
--- /dev/null
+++ b/tools/build/feature/test-disassembler-init-styled.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <stdio.h>
+#include <dis-asm.h>
+
+int main(void)
+{
+	struct disassemble_info info;
+
+	init_disassemble_info(&info, stdout,
+			      NULL, NULL);
+
+	return 0;
+}
-- 
2.37.0.3.g30cc8d0f14


  reply	other threads:[~2022-07-03 21:26 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-22 18:19 init_disassemble_info() signature changes causes compile failures Andres Freund
2022-06-22 22:53 ` Quentin Monnet
2022-06-22 23:16   ` Andres Freund
2022-06-23  9:49     ` Andrew Burgess
2022-07-03  4:48     ` [PATCH v1 0/3] tools: fix compilation failure caused by init_disassemble_info API changes Andres Freund
2022-07-03  4:48       ` [PATCH v1 1/3] tools build: add feature test for " Andres Freund
2022-07-03  4:48       ` [PATCH v1 2/3] tools: add dis-asm-compat.h to centralize handling of version differences Andres Freund
2022-07-03  4:48       ` [PATCH v1 2/3] tools: introduce dis-asm.h wrapper to hide " Andres Freund
2022-07-03  4:54         ` Andres Freund
2022-07-03  4:48       ` [PATCH v1 3/3] tools: Use tools/dis-asm-compat.h to fix compilation errors with new binutils Andres Freund
2022-07-03 21:25     ` [PATCH v2 0/5] tools: fix compilation failure caused by init_disassemble_info API changes Andres Freund
2022-07-03 21:25       ` Andres Freund [this message]
2022-07-03 21:25       ` [PATCH v2 2/5] tools include: add dis-asm-compat.h to handle version differences Andres Freund
2022-07-05 13:44         ` Quentin Monnet
2022-07-15 19:39           ` Andres Freund
2022-07-15 19:46             ` Andres Freund
2022-07-18  8:58             ` Quentin Monnet
2022-07-03 21:25       ` [PATCH v2 3/5] tools perf: Fix compilation error with new binutils Andres Freund
2022-07-03 21:25       ` [PATCH v2 4/5] tools bpf_jit_disasm: " Andres Freund
2022-07-03 21:25       ` [PATCH v2 5/5] tools bpftool: " Andres Freund
2022-07-04  9:13       ` [PATCH v2 0/5] tools: fix compilation failure caused by init_disassemble_info API changes Jiri Olsa
2022-07-04 20:19         ` Andres Freund
2022-07-04 22:12           ` Jiri Olsa
2022-08-01  1:40             ` Andres Freund
2022-07-10 11:43       ` Sedat Dilek
2022-07-10 17:52         ` Sedat Dilek
2022-07-14  9:16       ` Sedat Dilek
2022-07-14 13:25         ` Ben Hutchings
2022-07-15 19:16           ` Andres Freund
2022-07-15 19:18             ` Ben Hutchings
2022-08-01 18:08               ` Arnaldo Carvalho de Melo
2022-07-27 15:47             ` Arnaldo Carvalho de Melo
2022-07-30 21:45               ` Andres Freund
2022-08-01  1:38     ` [PATCH v3 0/8] " Andres Freund
2022-08-01  1:38       ` [PATCH v3 1/8] tools build: Add feature test for " Andres Freund
2022-08-01  1:38       ` [PATCH v3 2/8] tools build: Don't display disassembler-four-args feature test Andres Freund
2022-08-01 18:10         ` Arnaldo Carvalho de Melo
2022-08-01  1:38       ` [PATCH v3 3/8] tools include: add dis-asm-compat.h to handle version differences Andres Freund
2022-08-01 18:05         ` Arnaldo Carvalho de Melo
2022-08-01 18:10           ` Andres Freund
2022-08-01  1:38       ` [PATCH v3 4/8] tools perf: Fix compilation error with new binutils Andres Freund
2022-08-01  1:38       ` [PATCH v3 5/8] tools bpf_jit_disasm: " Andres Freund
2022-08-01  1:38       ` [PATCH v3 6/8] tools bpf_jit_disasm: Don't display disassembler-four-args feature test Andres Freund
2022-08-01 18:27         ` Arnaldo Carvalho de Melo
2022-08-01 18:41           ` Andres Freund
2022-08-01  1:38       ` [PATCH v3 7/8] tools bpftool: Fix compilation error with new binutils Andres Freund
2022-08-01  1:38       ` [PATCH v3 8/8] tools bpftool: Don't display disassembler-four-args feature test Andres Freund
2022-08-01 18:28         ` Arnaldo Carvalho de Melo
2022-08-01 12:45       ` [PATCH v3 0/8] tools: fix compilation failure caused by init_disassemble_info API changes Arnaldo Carvalho de Melo
2022-08-01 15:15         ` Quentin Monnet
2022-08-01 18:02           ` Arnaldo Carvalho de Melo
2022-08-08 13:35             ` Daniel Borkmann
2022-08-01 19:53         ` Jiri Olsa
2022-08-01 19:12       ` Sedat Dilek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220703212551.1114923-2-andres@anarazel.de \
    --to=andres@anarazel.de \
    --cc=acme@redhat.com \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=quentin@isovalent.com \
    --cc=sedat.dilek@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).