diff options
author | Tom Tromey <tom@tromey.com> | 2019-01-27 12:51:36 -0700 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2019-02-07 03:27:23 -0700 |
commit | 1a5c25988eabb35e0e40ea484b1eea029d9b7f53 (patch) | |
tree | 84c6f820847657cbb3a320ad7e1603cc42b2c3d9 /gdb/arch | |
parent | 31528deca52123a5a6dee19d47bee94dff041325 (diff) | |
download | gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.zip gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.gz gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.bz2 |
Normalize include guards in gdb
While working on my other scripts to deal with gdb headers, I noticed
that some files were missing include guards. I wrote a script to add
the missing ones, but found that using the obvious names for the
guards ran into clashes -- for example, gdb/nat/linux-nat.h used
"LINUX_NAT_H", but this was also the script's choice for
gdb/linux-nat.h.
So, I changed the script to normalize all include guards in gdb. This
patch is the result.
As usual the script is available here:
https://github.com/tromey/gdb-refactoring-scripts
Tested by rebuilding; I also ran it through "Fedora-x86_64-m64" on the
buildbot.
gdb/ChangeLog
2019-02-07 Tom Tromey <tom@tromey.com>
* yy-remap.h: Add include guard.
* xtensa-tdep.h: Add include guard.
* xcoffread.h: Rename include guard.
* varobj-iter.h: Add include guard.
* tui/tui.h: Rename include guard.
* tui/tui-winsource.h: Rename include guard.
* tui/tui-wingeneral.h: Rename include guard.
* tui/tui-windata.h: Rename include guard.
* tui/tui-win.h: Rename include guard.
* tui/tui-stack.h: Rename include guard.
* tui/tui-source.h: Rename include guard.
* tui/tui-regs.h: Rename include guard.
* tui/tui-out.h: Rename include guard.
* tui/tui-layout.h: Rename include guard.
* tui/tui-io.h: Rename include guard.
* tui/tui-hooks.h: Rename include guard.
* tui/tui-file.h: Rename include guard.
* tui/tui-disasm.h: Rename include guard.
* tui/tui-data.h: Rename include guard.
* tui/tui-command.h: Rename include guard.
* tic6x-tdep.h: Add include guard.
* target/waitstatus.h: Rename include guard.
* target/wait.h: Rename include guard.
* target/target.h: Rename include guard.
* target/resume.h: Rename include guard.
* target-float.h: Rename include guard.
* stabsread.h: Add include guard.
* rs6000-tdep.h: Add include guard.
* riscv-fbsd-tdep.h: Add include guard.
* regformats/regdef.h: Rename include guard.
* record.h: Rename include guard.
* python/python.h: Rename include guard.
* python/python-internal.h: Rename include guard.
* python/py-stopevent.h: Rename include guard.
* python/py-ref.h: Rename include guard.
* python/py-record.h: Rename include guard.
* python/py-record-full.h: Rename include guard.
* python/py-record-btrace.h: Rename include guard.
* python/py-instruction.h: Rename include guard.
* python/py-events.h: Rename include guard.
* python/py-event.h: Rename include guard.
* procfs.h: Add include guard.
* proc-utils.h: Add include guard.
* p-lang.h: Add include guard.
* or1k-tdep.h: Rename include guard.
* observable.h: Rename include guard.
* nto-tdep.h: Rename include guard.
* nat/x86-linux.h: Rename include guard.
* nat/x86-linux-dregs.h: Rename include guard.
* nat/x86-gcc-cpuid.h: Add include guard.
* nat/x86-dregs.h: Rename include guard.
* nat/x86-cpuid.h: Rename include guard.
* nat/ppc-linux.h: Rename include guard.
* nat/mips-linux-watch.h: Rename include guard.
* nat/linux-waitpid.h: Rename include guard.
* nat/linux-ptrace.h: Rename include guard.
* nat/linux-procfs.h: Rename include guard.
* nat/linux-osdata.h: Rename include guard.
* nat/linux-nat.h: Rename include guard.
* nat/linux-namespaces.h: Rename include guard.
* nat/linux-btrace.h: Rename include guard.
* nat/glibc_thread_db.h: Rename include guard.
* nat/gdb_thread_db.h: Rename include guard.
* nat/gdb_ptrace.h: Rename include guard.
* nat/fork-inferior.h: Rename include guard.
* nat/amd64-linux-siginfo.h: Rename include guard.
* nat/aarch64-sve-linux-sigcontext.h: Rename include guard.
* nat/aarch64-sve-linux-ptrace.h: Rename include guard.
* nat/aarch64-linux.h: Rename include guard.
* nat/aarch64-linux-hw-point.h: Rename include guard.
* mn10300-tdep.h: Add include guard.
* mips-linux-tdep.h: Add include guard.
* mi/mi-parse.h: Rename include guard.
* mi/mi-out.h: Rename include guard.
* mi/mi-main.h: Rename include guard.
* mi/mi-interp.h: Rename include guard.
* mi/mi-getopt.h: Rename include guard.
* mi/mi-console.h: Rename include guard.
* mi/mi-common.h: Rename include guard.
* mi/mi-cmds.h: Rename include guard.
* mi/mi-cmd-break.h: Rename include guard.
* m2-lang.h: Add include guard.
* location.h: Rename include guard.
* linux-record.h: Rename include guard.
* linux-nat.h: Add include guard.
* linux-fork.h: Add include guard.
* i386-darwin-tdep.h: Rename include guard.
* hppa-linux-offsets.h: Add include guard.
* guile/guile.h: Rename include guard.
* guile/guile-internal.h: Rename include guard.
* gnu-nat.h: Rename include guard.
* gdb-stabs.h: Rename include guard.
* frv-tdep.h: Add include guard.
* f-lang.h: Add include guard.
* event-loop.h: Add include guard.
* darwin-nat.h: Rename include guard.
* cp-abi.h: Rename include guard.
* config/sparc/nm-sol2.h: Rename include guard.
* config/nm-nto.h: Rename include guard.
* config/nm-linux.h: Add include guard.
* config/i386/nm-i386gnu.h: Rename include guard.
* config/djgpp/nl_types.h: Rename include guard.
* config/djgpp/langinfo.h: Rename include guard.
* compile/gcc-cp-plugin.h: Add include guard.
* compile/gcc-c-plugin.h: Add include guard.
* compile/compile.h: Rename include guard.
* compile/compile-object-run.h: Rename include guard.
* compile/compile-object-load.h: Rename include guard.
* compile/compile-internal.h: Rename include guard.
* compile/compile-cplus.h: Rename include guard.
* compile/compile-c.h: Rename include guard.
* common/xml-utils.h: Rename include guard.
* common/x86-xstate.h: Rename include guard.
* common/version.h: Rename include guard.
* common/vec.h: Rename include guard.
* common/tdesc.h: Rename include guard.
* common/selftest.h: Rename include guard.
* common/scoped_restore.h: Rename include guard.
* common/scoped_mmap.h: Rename include guard.
* common/scoped_fd.h: Rename include guard.
* common/safe-iterator.h: Rename include guard.
* common/run-time-clock.h: Rename include guard.
* common/refcounted-object.h: Rename include guard.
* common/queue.h: Rename include guard.
* common/ptid.h: Rename include guard.
* common/print-utils.h: Rename include guard.
* common/preprocessor.h: Rename include guard.
* common/pathstuff.h: Rename include guard.
* common/observable.h: Rename include guard.
* common/netstuff.h: Rename include guard.
* common/job-control.h: Rename include guard.
* common/host-defs.h: Rename include guard.
* common/gdb_wait.h: Rename include guard.
* common/gdb_vecs.h: Rename include guard.
* common/gdb_unlinker.h: Rename include guard.
* common/gdb_unique_ptr.h: Rename include guard.
* common/gdb_tilde_expand.h: Rename include guard.
* common/gdb_sys_time.h: Rename include guard.
* common/gdb_string_view.h: Rename include guard.
* common/gdb_splay_tree.h: Rename include guard.
* common/gdb_setjmp.h: Rename include guard.
* common/gdb_ref_ptr.h: Rename include guard.
* common/gdb_optional.h: Rename include guard.
* common/gdb_locale.h: Rename include guard.
* common/gdb_assert.h: Rename include guard.
* common/filtered-iterator.h: Rename include guard.
* common/filestuff.h: Rename include guard.
* common/fileio.h: Rename include guard.
* common/environ.h: Rename include guard.
* common/common-utils.h: Rename include guard.
* common/common-types.h: Rename include guard.
* common/common-regcache.h: Rename include guard.
* common/common-inferior.h: Rename include guard.
* common/common-gdbthread.h: Rename include guard.
* common/common-exceptions.h: Rename include guard.
* common/common-defs.h: Rename include guard.
* common/common-debug.h: Rename include guard.
* common/cleanups.h: Rename include guard.
* common/buffer.h: Rename include guard.
* common/btrace-common.h: Rename include guard.
* common/break-common.h: Rename include guard.
* cli/cli-utils.h: Rename include guard.
* cli/cli-style.h: Rename include guard.
* cli/cli-setshow.h: Rename include guard.
* cli/cli-script.h: Rename include guard.
* cli/cli-interp.h: Rename include guard.
* cli/cli-decode.h: Rename include guard.
* cli/cli-cmds.h: Rename include guard.
* charset-list.h: Add include guard.
* buildsym-legacy.h: Rename include guard.
* bfin-tdep.h: Add include guard.
* ax.h: Rename include guard.
* arm-linux-tdep.h: Add include guard.
* arm-fbsd-tdep.h: Add include guard.
* arch/xtensa.h: Rename include guard.
* arch/tic6x.h: Add include guard.
* arch/i386.h: Add include guard.
* arch/arm.h: Rename include guard.
* arch/arm-linux.h: Rename include guard.
* arch/arm-get-next-pcs.h: Rename include guard.
* arch/amd64.h: Add include guard.
* arch/aarch64-insn.h: Rename include guard.
* arch-utils.h: Rename include guard.
* annotate.h: Add include guard.
* amd64-darwin-tdep.h: Rename include guard.
* aarch64-linux-tdep.h: Add include guard.
* aarch64-fbsd-tdep.h: Add include guard.
* aarch32-linux-nat.h: Add include guard.
gdb/gdbserver/ChangeLog
2019-02-07 Tom Tromey <tom@tromey.com>
* x86-tdesc.h: Rename include guard.
* x86-low.h: Add include guard.
* wincecompat.h: Rename include guard.
* win32-low.h: Add include guard.
* utils.h: Rename include guard.
* tracepoint.h: Rename include guard.
* tdesc.h: Rename include guard.
* target.h: Rename include guard.
* server.h: Rename include guard.
* remote-utils.h: Rename include guard.
* regcache.h: Rename include guard.
* nto-low.h: Rename include guard.
* notif.h: Add include guard.
* mem-break.h: Rename include guard.
* lynx-low.h: Add include guard.
* linux-x86-tdesc.h: Add include guard.
* linux-s390-tdesc.h: Add include guard.
* linux-ppc-tdesc-init.h: Add include guard.
* linux-low.h: Add include guard.
* linux-aarch64-tdesc.h: Add include guard.
* linux-aarch32-low.h: Add include guard.
* inferiors.h: Rename include guard.
* i387-fp.h: Rename include guard.
* hostio.h: Rename include guard.
* gdbthread.h: Rename include guard.
* gdb_proc_service.h: Rename include guard.
* event-loop.h: Rename include guard.
* dll.h: Rename include guard.
* debug.h: Rename include guard.
* ax.h: Rename include guard.
Diffstat (limited to 'gdb/arch')
-rw-r--r-- | gdb/arch/aarch64-insn.h | 6 | ||||
-rw-r--r-- | gdb/arch/amd64.h | 5 | ||||
-rw-r--r-- | gdb/arch/arm-get-next-pcs.h | 6 | ||||
-rw-r--r-- | gdb/arch/arm-linux.h | 7 | ||||
-rw-r--r-- | gdb/arch/arm.h | 6 | ||||
-rw-r--r-- | gdb/arch/i386.h | 5 | ||||
-rw-r--r-- | gdb/arch/tic6x.h | 5 | ||||
-rw-r--r-- | gdb/arch/xtensa.h | 6 |
8 files changed, 31 insertions, 15 deletions
diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h index 43120cc..4492594 100644 --- a/gdb/arch/aarch64-insn.h +++ b/gdb/arch/aarch64-insn.h @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef AARCH64_INSN_H -#define AARCH64_INSN_H 1 +#ifndef ARCH_AARCH64_INSN_H +#define ARCH_AARCH64_INSN_H extern int aarch64_debug; @@ -321,4 +321,4 @@ int aarch64_emit_load_store (uint32_t *buf, uint32_t size, struct aarch64_register rn, struct aarch64_memory_operand operand); -#endif +#endif /* ARCH_AARCH64_INSN_H */ diff --git a/gdb/arch/amd64.h b/gdb/arch/amd64.h index 9431e08..1e02c52 100644 --- a/gdb/arch/amd64.h +++ b/gdb/arch/amd64.h @@ -15,8 +15,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef ARCH_AMD64_H +#define ARCH_AMD64_H + #include "common/tdesc.h" #include <stdint.h> target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32, bool is_linux, bool segments); + +#endif /* ARCH_AMD64_H */ diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h index 59f0316..7c5ad5e 100644 --- a/gdb/arch/arm-get-next-pcs.h +++ b/gdb/arch/arm-get-next-pcs.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ARM_GET_NEXT_PCS_H -#define ARM_GET_NEXT_PCS_H 1 +#ifndef ARCH_ARM_GET_NEXT_PCS_H +#define ARCH_ARM_GET_NEXT_PCS_H #include <vector> @@ -64,4 +64,4 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self, /* Find the next possible PCs after the current instruction executes. */ std::vector<CORE_ADDR> arm_get_next_pcs (struct arm_get_next_pcs *self); -#endif /* ARM_GET_NEXT_PCS_H */ +#endif /* ARCH_ARM_GET_NEXT_PCS_H */ diff --git a/gdb/arch/arm-linux.h b/gdb/arch/arm-linux.h index d5ee140..04d3f23 100644 --- a/gdb/arch/arm-linux.h +++ b/gdb/arch/arm-linux.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ARM_LINUX_H -#define ARM_LINUX_H +#ifndef ARCH_ARM_LINUX_H +#define ARCH_ARM_LINUX_H /* The index to access CSPR in user_regs defined in GLIBC. */ #define ARM_CPSR_GREGNUM 16 @@ -78,4 +78,5 @@ struct arm_get_next_pcs; CORE_ADDR arm_linux_get_next_pcs_fixup (struct arm_get_next_pcs *self, CORE_ADDR pc); -#endif /* ARM_LINUX_H */ + +#endif /* ARCH_ARM_LINUX_H */ diff --git a/gdb/arch/arm.h b/gdb/arch/arm.h index 21d45c5..c178542 100644 --- a/gdb/arch/arm.h +++ b/gdb/arch/arm.h @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ARM_H -#define ARM_H +#ifndef ARCH_ARM_H +#define ARCH_ARM_H /* Register numbers of various important registers. */ @@ -146,4 +146,4 @@ unsigned long shifted_reg_val (struct regcache *regcache, unsigned long pc_val, unsigned long status_reg); -#endif +#endif /* ARCH_ARM_H */ diff --git a/gdb/arch/i386.h b/gdb/arch/i386.h index a6a801b..fa85438 100644 --- a/gdb/arch/i386.h +++ b/gdb/arch/i386.h @@ -15,7 +15,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef ARCH_I386_H +#define ARCH_I386_H + #include "common/tdesc.h" #include <stdint.h> target_desc *i386_create_target_description (uint64_t xcr0, bool is_linux); + +#endif /* ARCH_I386_H */ diff --git a/gdb/arch/tic6x.h b/gdb/arch/tic6x.h index e1c819d..36dadb3 100644 --- a/gdb/arch/tic6x.h +++ b/gdb/arch/tic6x.h @@ -15,6 +15,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef ARCH_TIC6X_H +#define ARCH_TIC6X_H + enum c6x_feature { C6X_CORE, @@ -24,3 +27,5 @@ enum c6x_feature }; target_desc *tic6x_create_target_description (enum c6x_feature feature); + +#endif /* ARCH_TIC6X_H */ diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h index 044d0c9..9a6fa33 100644 --- a/gdb/arch/xtensa.h +++ b/gdb/arch/xtensa.h @@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef XTENSA_H -#define XTENSA_H +#ifndef ARCH_XTENSA_H +#define ARCH_XTENSA_H /* Xtensa ELF core file register set representation ('.reg' section). Copied from target-side ELF header <xtensa/elf.h>. */ @@ -45,4 +45,4 @@ typedef struct #define C0_NREGS 16 /* Number of A-registers to track in call0 ABI. */ -#endif +#endif /* ARCH_XTENSA_H */ |