| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596 |
- From 08ec5766e5cf7b24fdebefb83b6f760bceeddf40 Mon Sep 17 00:00:00 2001
- From: Andres Freund <[email protected]>
- Date: Sun, 31 Jul 2022 18:38:29 -0700
- Subject: [PATCH 2/5] tools include: add dis-asm-compat.h to handle version
- differences
- 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 introduces a wrapper for init_disassemble_info(), to avoid
- spreading #ifdef DISASM_INIT_STYLED to a bunch of places. Subsequent
- commits will use it to fix the build failures.
- It likely is worth adding a wrapper for disassember(), to avoid the already
- existing DISASM_FOUR_ARGS_SIGNATURE ifdefery.
- Signed-off-by: Andres Freund <[email protected]>
- Signed-off-by: Ben Hutchings <[email protected]>
- Acked-by: Quentin Monnet <[email protected]>
- Cc: Alexei Starovoitov <[email protected]>
- Cc: Ben Hutchings <[email protected]>
- Cc: Jiri Olsa <[email protected]>
- Cc: Quentin Monnet <[email protected]>
- Cc: Sedat Dilek <[email protected]>
- Cc: [email protected]
- Link: http://lore.kernel.org/lkml/[email protected]
- Link: https://lore.kernel.org/r/[email protected]
- Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
- (cherry picked from commit a45b3d6926231c3d024ea0de4f7bd967f83709ee)
- ---
- tools/include/tools/dis-asm-compat.h | 55 ++++++++++++++++++++++++++++
- 1 file changed, 55 insertions(+)
- create mode 100644 tools/include/tools/dis-asm-compat.h
- --- /dev/null
- +++ b/tools/include/tools/dis-asm-compat.h
- @@ -0,0 +1,55 @@
- +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */
- +#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 unstyled_func,
- + fprintf_styled_ftype styled_func)
- +{
- +#ifdef DISASM_INIT_STYLED
- + init_disassemble_info(info, stream,
- + unstyled_func,
- + styled_func);
- +#else
- + (void)styled_func;
- + init_disassemble_info(info, stream,
- + unstyled_func);
- +#endif
- +}
- +
- +#endif /* _TOOLS_DIS_ASM_COMPAT_H */
|
