perf dwarf: Guard !x86_64 definitions under #ifdef else clause
To fix the build on Fedora Rawhide (gcc 6.0.0 20160311 (Red Hat 6.0.0-0.17): CC /tmp/build/perf/arch/x86/util/dwarf-regs.o arch/x86/util/dwarf-regs.c:66:36: error: 'x86_32_regoffset_table' defined but not used [-Werror=unused-const-variable=] static const struct pt_regs_offset x86_32_regoffset_table[] = { ^~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-fghuksc1u8ln82bof4lwcj0o@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
22a9f41b55
Коммит
62aa0e177d
|
@ -63,6 +63,8 @@ struct pt_regs_offset {
|
||||||
# define REG_OFFSET_NAME_32(n, r) {.name = n, .offset = offsetof(struct pt_regs, r)}
|
# define REG_OFFSET_NAME_32(n, r) {.name = n, .offset = offsetof(struct pt_regs, r)}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* TODO: switching by dwarf address size */
|
||||||
|
#ifndef __x86_64__
|
||||||
static const struct pt_regs_offset x86_32_regoffset_table[] = {
|
static const struct pt_regs_offset x86_32_regoffset_table[] = {
|
||||||
REG_OFFSET_NAME_32("%ax", eax),
|
REG_OFFSET_NAME_32("%ax", eax),
|
||||||
REG_OFFSET_NAME_32("%cx", ecx),
|
REG_OFFSET_NAME_32("%cx", ecx),
|
||||||
|
@ -75,6 +77,8 @@ static const struct pt_regs_offset x86_32_regoffset_table[] = {
|
||||||
REG_OFFSET_END,
|
REG_OFFSET_END,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define regoffset_table x86_32_regoffset_table
|
||||||
|
#else
|
||||||
static const struct pt_regs_offset x86_64_regoffset_table[] = {
|
static const struct pt_regs_offset x86_64_regoffset_table[] = {
|
||||||
REG_OFFSET_NAME_64("%ax", rax),
|
REG_OFFSET_NAME_64("%ax", rax),
|
||||||
REG_OFFSET_NAME_64("%dx", rdx),
|
REG_OFFSET_NAME_64("%dx", rdx),
|
||||||
|
@ -95,11 +99,7 @@ static const struct pt_regs_offset x86_64_regoffset_table[] = {
|
||||||
REG_OFFSET_END,
|
REG_OFFSET_END,
|
||||||
};
|
};
|
||||||
|
|
||||||
/* TODO: switching by dwarf address size */
|
|
||||||
#ifdef __x86_64__
|
|
||||||
#define regoffset_table x86_64_regoffset_table
|
#define regoffset_table x86_64_regoffset_table
|
||||||
#else
|
|
||||||
#define regoffset_table x86_32_regoffset_table
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Minus 1 for the ending REG_OFFSET_END */
|
/* Minus 1 for the ending REG_OFFSET_END */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче