From c7ae7675cf726c343a1db3e27e3e5665cb485271 Mon Sep 17 00:00:00 2001 From: Christian Biesinger Date: Thu, 19 Sep 2019 13:33:35 +0900 Subject: [PATCH] Move arm_apcs_32 extern declaration to header Instead of having several extern declarations for arm_apcs_32 in a few .c files, declare it in arm-tdep.h. This file is already included from these .c files. gdb/ChangeLog: 2019-09-19 Christian Biesinger * arm-linux-nat.c: Remove extern declaration for arm_apcs_32. * arm-linux-tdep.c: Likewise. * arm-nbsd-nat.c: Likewise. * arm-tdep.h: Declare arm_apcs_32. --- gdb/ChangeLog | 8 ++++++++ gdb/arm-linux-nat.c | 2 -- gdb/arm-linux-tdep.c | 1 - gdb/arm-nbsd-nat.c | 2 -- gdb/arm-tdep.c | 2 +- gdb/arm-tdep.h | 4 ++++ 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 45e6e79fb8..c7e724eb8b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-09-19 Christian Biesinger + + * arm-linux-nat.c: Remove extern declaration for arm_apcs_32. + * arm-linux-tdep.c: Likewise. + * arm-nbsd-nat.c: Likewise. + * arm-tdep.h: Declare arm_apcs_32. + * arm-tdep.c: Move documentation for arm_apcs_32 to arm-tdep.h. + 2019-09-19 Christian Biesinger * dwarf2loc.c: Remove extern declaration of dwarf_always_disassemble. diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index ef44e68d31..bef67c7ac7 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -66,8 +66,6 @@ #define PTRACE_SETHBPREGS 30 #endif -extern bool arm_apcs_32; - class arm_linux_nat_target final : public linux_nat_target { public: diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c index 31ea4564db..54ea8511cb 100644 --- a/gdb/arm-linux-tdep.c +++ b/gdb/arm-linux-tdep.c @@ -56,7 +56,6 @@ #include "user-regs.h" #include #include "elf/common.h" -extern bool arm_apcs_32; /* Under ARM GNU/Linux the traditional way of performing a breakpoint is to execute a particular software interrupt, rather than use a diff --git a/gdb/arm-nbsd-nat.c b/gdb/arm-nbsd-nat.c index 38a9e954b9..5160bfddf5 100644 --- a/gdb/arm-nbsd-nat.c +++ b/gdb/arm-nbsd-nat.c @@ -40,8 +40,6 @@ public: static arm_netbsd_nat_target the_arm_netbsd_nat_target; -extern bool arm_apcs_32; - static void arm_supply_gregset (struct regcache *regcache, struct reg *gregset) { diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index e17550fed7..c247052148 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -294,7 +294,7 @@ static CORE_ADDR arm_analyze_prologue (struct gdbarch *gdbarch, #define DISPLACED_STEPPING_ARCH_VERSION 5 -/* Set to true if the 32-bit mode is in use. */ +/* See arm-tdep.h. */ bool arm_apcs_32 = true; diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h index 6d1a91ca35..2cf3379d78 100644 --- a/gdb/arm-tdep.h +++ b/gdb/arm-tdep.h @@ -26,6 +26,10 @@ struct get_next_pcs; struct arm_get_next_pcs; struct gdb_get_next_pcs; +/* Set to true if the 32-bit mode is in use. */ + +extern bool arm_apcs_32; + #include "gdbarch.h" #include "arch/arm.h" #include "infrun.h" -- 2.34.1