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) <mhiramat@kernel.org> Signed-off-by: Ian Rogers <irogers@google.com> Cc: Anup Patel <anup@brainfault.org> Cc: Yang Jihong <yangjihong@bytedance.com> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: David S. Miller <davem@davemloft.net> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Shenlin Liang <liangshenlin@eswincomputing.com> Cc: Nick Terrell <terrelln@fb.com> Cc: Guilherme Amadio <amadio@gentoo.org> Cc: Steinar H. Gunderson <sesse@google.com> Cc: Changbin Du <changbin.du@huawei.com> Cc: Alexander Lobakin <aleksander.lobakin@intel.com> Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Guo Ren <guoren@kernel.org> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: James Clark <james.clark@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Chen Pei <cp0613@linux.alibaba.com> Cc: Leo Yan <leo.yan@linux.dev> Cc: Oliver Upton <oliver.upton@linux.dev> Cc: Aditya Gupta <adityag@linux.ibm.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-riscv@lists.infradead.org Cc: Bibo Mao <maobibo@loongson.cn> Cc: John Garry <john.g.garry@oracle.com> Cc: Atish Patra <atishp@rivosinc.com> Cc: Dima Kogan <dima@secretsauce.net> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Dr. David Alan Gilbert <linux@treblig.org> Cc: linux-csky@vger.kernel.org Link: https://lore.kernel.org/r/20241108234606.429459-10-irogers@google.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 6f8e8ad commit 0c0a20e

4 files changed

Lines changed: 3 additions & 66 deletions

File tree

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)