2022-07-03 04:51:06

by Andres Freund

Subject: [PATCH v1 2/3] tools: introduce dis-asm.h wrapper to hide version differences

binutils changed the signature of init_disassemble_info(), which now causes
perf and bpftool to fail to compile (e.g. on debian unstable). Relevant
binutils commit:
https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07

This just wraps init_disassemble_info(), to avoid spreading #ifdef
DISASM_INIT_STYLED to a bunch of places. It likely is worth adding a
wrapper for disassember(), to avoid the already existing #ifdef
DISASM_FOUR_ARGS_SIGNATURE.

Link: http://lore.kernel.org/lkml/[email protected]
Signed-off-by: Andres Freund <[email protected]>
---
tools/include/tools/dis-asm-compat.h | 53 ++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 tools/include/tools/dis-asm-compat.h

diff --git a/tools/include/tools/dis-asm-compat.h b/tools/include/tools/dis-asm-compat.h
new file mode 100644
index 000000000000..f44f7d9f053e
--- /dev/null
+++ b/tools/include/tools/dis-asm-compat.h
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _TOOLS_DIS_ASM_COMPAT_H
+#define _TOOLS_DIS_ASM_COMPAT_H
+
+#include <stdio.h>
+#include <dis-asm.h>
+
+/* define types for older binutils version, to centralize ifdef'ery a bit */
+#ifndef DISASM_INIT_STYLED
+enum disassembler_style {DISASSEMBLER_STYLE_NOT_EMPTY};
+typedef int (*fprintf_styled_ftype) (void *, enum disassembler_style, const char*, ...);
+#endif
+
+/*
+ * Trivial fprintf wrapper to be used as the fprintf_styled_func argument to
+ * init_disassemble_info_compat() when normal fprintf suffices.
+ */
+static inline int fprintf_styled(void *out, enum disassembler_style style, const char *fmt, ...)
+{
+ va_list args;
+ int r;
+
+ (void)style;
+
+ va_start(args, fmt);
+ r = vfprintf(out, fmt, args);
+ va_end(args);
+
+ return r;
+}
+
+/*
+ * Wrapper for init_disassemble_info() that hides version
+ * differences. Depending on binutils version and architecture either
+ * fprintf_func or fprintf_styled_func will be called.
+ */
+static inline void init_disassemble_info_compat(struct disassemble_info *info,
+ void *stream,
+ fprintf_ftype fprintf_func,
+ fprintf_styled_ftype fprintf_styled_func)
+{
+#ifdef DISASM_INIT_STYLED
+ init_disassemble_info(info, stream,
+ fprintf_func,
+ fprintf_styled_func);
+#else
+ (void)fprintf_styled_func;
+ init_disassemble_info(info, stream,
+ fprintf_func);
+#endif
+}
+
+#endif /* _TOOLS_DIS_ASM_COMPAT_H */
--
2.35.1.677.gabf474a5dd

2022-07-03 05:01:24

by Andres Freund

Subject: Re: [PATCH v1 2/3] tools: introduce dis-asm.h wrapper to hide version differences

Hi,

On 2022-07-02 21:48:13 -0700, Andres Freund wrote:
> binutils changed the signature of init_disassemble_info(), which now causes
> perf and bpftool to fail to compile (e.g. on debian unstable). Relevant
> binutils commit:
> https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=60a3da00bd5407f07
>
> This just wraps init_disassemble_info(), to avoid spreading #ifdef
> DISASM_INIT_STYLED to a bunch of places. It likely is worth adding a
> wrapper for disassember(), to avoid the already existing #ifdef
> DISASM_FOUR_ARGS_SIGNATURE.
>
> Link: http://lore.kernel.org/lkml/[email protected]
> Signed-off-by: Andres Freund <[email protected]>

Argh, please disregard this version of 0002 - it's an older version that I
somehow managed to send unintentionally. I don't use git send-email often...

Greetings,

Andres Freund