Skip to content

Commit b232b70

Browse files
captain5050namhyung
authored andcommitted
perf s390: Remove dwarf-regs.c
The file just provides the function get_arch_regstr, however, if in the only caller get_dwarf_regstr EM_HOST is used for the EM_NONE case the function can never be called. So remove as dead code. Tidy up the EM_NONE cases for s390 in dwarf-regs.c. Reviewed-by: Masami Hiramatsu (Google) <[email protected]> Signed-off-by: Ian Rogers <[email protected]> Cc: Anup Patel <[email protected]> Cc: Yang Jihong <[email protected]> Cc: Palmer Dabbelt <[email protected]> Cc: David S. Miller <[email protected]> Cc: Albert Ou <[email protected]> Cc: Shenlin Liang <[email protected]> Cc: Nick Terrell <[email protected]> Cc: Guilherme Amadio <[email protected]> Cc: Steinar H. Gunderson <[email protected]> Cc: Changbin Du <[email protected]> Cc: Alexander Lobakin <[email protected]> Cc: Przemek Kitszel <[email protected]> Cc: Huacai Chen <[email protected]> Cc: Guo Ren <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: Will Deacon <[email protected]> Cc: James Clark <[email protected]> Cc: Mike Leach <[email protected]> Cc: Chen Pei <[email protected]> Cc: Leo Yan <[email protected]> Cc: Oliver Upton <[email protected]> Cc: Aditya Gupta <[email protected]> Cc: Kajol Jain <[email protected]> Cc: Athira Rajeev <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Bibo Mao <[email protected]> Cc: John Garry <[email protected]> Cc: Atish Patra <[email protected]> Cc: Dima Kogan <[email protected]> Cc: Paul Walmsley <[email protected]> Cc: Dr. David Alan Gilbert <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Namhyung Kim <[email protected]>
1 parent a90c451 commit b232b70

File tree

4 files changed

+3
-20
lines changed

4 files changed

+3
-20
lines changed

tools/perf/arch/s390/util/Build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ perf-util-y += header.o
22
perf-util-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o
33
perf-util-y += perf_regs.o
44

5-
perf-util-$(CONFIG_LIBDW) += dwarf-regs.o
65
perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
76

87
perf-util-y += machine.o

tools/perf/arch/s390/util/dwarf-regs.c

Lines changed: 0 additions & 16 deletions
This file was deleted.

tools/perf/util/dwarf-regs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int
3434
{
3535
#if EM_HOST == EM_X86_64 || EM_HOST == EM_386 || EM_HOST == EM_AARCH64 || EM_HOST == EM_ARM \
3636
|| EM_HOST == EM_CSKY || EM_HOST == EM_LOONGARCH || EM_HOST == EM_MIPS || EM_HOST == EM_PPC \
37-
|| EM_HOST == EM_PPC64 || EM_HOST == EM_RISCV
37+
|| EM_HOST == EM_PPC64 || EM_HOST == EM_RISCV || EM_HOST == EM_S390
3838
if (machine == EM_NONE) {
3939
/* Generic arch - use host arch */
4040
machine = EM_HOST;
@@ -43,7 +43,7 @@ const char *get_dwarf_regstr(unsigned int n, unsigned int machine, unsigned int
4343
switch (machine) {
4444
#if EM_HOST != EM_X86_64 && EM_HOST != EM_386 && EM_HOST != EM_AARCH64 && EM_HOST != EM_ARM \
4545
&& EM_HOST != EM_CSKY && EM_HOST != EM_LOONGARCH && EM_HOST != EM_MIPS && EM_HOST != EM_PPC \
46-
&& EM_HOST != EM_PPC64 && EM_HOST != EM_RISCV
46+
&& EM_HOST != EM_PPC64 && EM_HOST != EM_RISCV && EM_HOST != EM_S390
4747
case EM_NONE: /* Generic arch - use host arch */
4848
return get_arch_regstr(n);
4949
#endif

tools/perf/util/include/dwarf-regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
#ifdef HAVE_LIBDW_SUPPORT
9292
#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__) \
9393
&& !defined(__loongarch__) && !defined(__mips__) && !defined(__powerpc__) \
94-
&& !defined(__powerpc64__) && !defined(__riscv__)
94+
&& !defined(__powerpc64__) && !defined(__riscv__) && !defined(__s390x__)
9595
const char *get_arch_regstr(unsigned int n);
9696
#endif
9797

0 commit comments

Comments
 (0)