Merge remote-tracking branch 'origin/master' into amd-common

[deliverable/binutils-gdb.git] / gdb / arch / aarch64-insn.h

diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h
index 7a45d011fc91d8129526549b533d130281968ca1..6a63ce9c2005acd6fe018a12c640f1be01751d6b 100644 (file)
--- a/gdb/arch/aarch64-insn.h
+++ b/gdb/arch/aarch64-insn.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2018 Free Software Foundation, Inc.
+/* Copyright (C) 2009-2020 Free Software Foundation, Inc.
    Contributed by ARM Ltd.
 
    This file is part of GDB.
@@ -16,10 +16,10 @@
    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;
+extern bool aarch64_debug;
 
 /* List of opcodes that we need for building the jump pad and relocating
    an instruction.  */
@@ -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 */