From: Martin Kaiser Date: Tue, 9 Jun 2026 08:13:08 +0000 (+0200) Subject: perf dwarf: Avoid redefinition warnings for REG_DWARFNUM_NAME X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=d5312a7ef79f5de574bce7b140ea1e48ce7e9262;p=thirdparty%2Fkernel%2Flinux.git perf dwarf: Avoid redefinition warnings for REG_DWARFNUM_NAME dwarf-regs.c includes an arch-specific dwarf-regs-table.h for several architectures. This pulls in different definitions of REG_DWARFNUM_NAME and causes compiler warnings for W=1 builds. In file included from util/dwarf-regs.c:23: .../dwarf-regs-table.h:5: error: "REG_DWARFNUM_NAME" redefined [-Werror] #define REG_DWARFNUM_NAME(reg, idx) [idx] = reg Undefine REG_DWARFNUM_NAME before each new definition. Suggested-by: Arnaldo Carvalho de Melo Signed-off-by: Martin Kaiser Cc: Ian Rogers Cc: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo --- diff --git a/tools/perf/arch/powerpc/include/dwarf-regs-table.h b/tools/perf/arch/powerpc/include/dwarf-regs-table.h index 66dc015a733d6..7e746cb31b66e 100644 --- a/tools/perf/arch/powerpc/include/dwarf-regs-table.h +++ b/tools/perf/arch/powerpc/include/dwarf-regs-table.h @@ -7,6 +7,7 @@ * http://refspecs.linuxfoundation.org/ELF/ppc64/PPC-elf64abi-1.9.html * http://refspecs.linux-foundation.org/elf/elfspec_ppc.pdf */ +#undef REG_DWARFNUM_NAME #define REG_DWARFNUM_NAME(reg, idx) [idx] = "%" #reg static const char * const powerpc_regstr_tbl[] = { diff --git a/tools/perf/arch/riscv/include/dwarf-regs-table.h b/tools/perf/arch/riscv/include/dwarf-regs-table.h index a45b63a6d5a8e..009a4e3c51ab3 100644 --- a/tools/perf/arch/riscv/include/dwarf-regs-table.h +++ b/tools/perf/arch/riscv/include/dwarf-regs-table.h @@ -2,6 +2,7 @@ #ifdef DEFINE_DWARF_REGSTR_TABLE /* This is included in perf/util/dwarf-regs.c */ +#undef REG_DWARFNUM_NAME #define REG_DWARFNUM_NAME(reg, idx) [idx] = "%" #reg static const char * const riscv_regstr_tbl[] = { diff --git a/tools/perf/arch/s390/include/dwarf-regs-table.h b/tools/perf/arch/s390/include/dwarf-regs-table.h index 671553525f415..e90b631577023 100644 --- a/tools/perf/arch/s390/include/dwarf-regs-table.h +++ b/tools/perf/arch/s390/include/dwarf-regs-table.h @@ -2,6 +2,7 @@ #ifndef S390_DWARF_REGS_TABLE_H #define S390_DWARF_REGS_TABLE_H +#undef REG_DWARFNUM_NAME #define REG_DWARFNUM_NAME(reg, idx) [idx] = "%" #reg /*