Skip to content

Commit 0c0a20e

Browse files
captain5050namhyung
authored andcommitted
perf arm: 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 arm 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 6f8e8ad commit 0c0a20e

File tree

4 files changed

+3
-66
lines changed

4 files changed

+3
-66
lines changed

tools/perf/arch/arm/util/Build

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
perf-util-y += perf_regs.o
22

3-
perf-util-$(CONFIG_LIBDW) += dwarf-regs.o
4-
53
perf-util-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
64
perf-util-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
75

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

Lines changed: 0 additions & 61 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
@@ -32,14 +32,14 @@
3232
const char *get_dwarf_regstr(unsigned int n, unsigned int machine,
3333
unsigned int flags __maybe_unused)
3434
{
35-
#if EM_HOST == EM_X86_64 || EM_HOST == EM_386 || EM_HOST == EM_AARCH64
35+
#if EM_HOST == EM_X86_64 || EM_HOST == EM_386 || EM_HOST == EM_AARCH64 || EM_HOST == EM_ARM
3636
if (machine == EM_NONE) {
3737
/* Generic arch - use host arch */
3838
machine = EM_HOST;
3939
}
4040
#endif
4141
switch (machine) {
42-
#if EM_HOST != EM_X86_64 && EM_HOST != EM_386 && EM_HOST != EM_AARCH64
42+
#if EM_HOST != EM_X86_64 && EM_HOST != EM_386 && EM_HOST != EM_AARCH64 && EM_HOST != EM_ARM
4343
case EM_NONE: /* Generic arch - use host arch */
4444
return get_arch_regstr(n);
4545
#endif

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
#define DWARF_REG_FB 0xd3affb /* random number */
9090

9191
#ifdef HAVE_LIBDW_SUPPORT
92-
#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__)
92+
#if !defined(__x86_64__) && !defined(__i386__) && !defined(__aarch64__) && !defined(__arm__)
9393
const char *get_arch_regstr(unsigned int n);
9494
#endif
9595

0 commit comments

Comments
 (0)