Define enum out of struct

This patch moves the definition of enum out of the scope of struct
aarch64_memory_operand, otherwise it breaks GDB build in c++ mode.

gdb:

2015-10-14  Yao Qi  <yao.qi@linaro.org>

	* arch/aarch64-insn.h (struct aarch64_memory_operand): Move enum
	out of it.
	(enum aarch64_memory_operand_type): New.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cabfe362feeb583e549de47a3b0a31ac6eabfd34..4b8ffb7bf631100369b1a9215289587bef4f021a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-14  Yao Qi  <yao.qi@linaro.org>
+
+       * arch/aarch64-insn.h (struct aarch64_memory_operand): Move enum
+       out of it.
+       (enum aarch64_memory_operand_type): New.
+
 2015-10-13  David Edelsohn  <dje.gcc@gmail.com>
 
        * xcoffread.c (dwarf2_xcoff_names): Add .dwmac and .dwpbtyp.

diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h
index d51cabc5cf2b93fa7ef9f3071fe56c87ea8403e6..cc7ec485951e929f287a734b9d8423a4c73824c2 100644 (file)
--- a/gdb/arch/aarch64-insn.h
+++ b/gdb/arch/aarch64-insn.h
@@ -117,6 +117,13 @@ struct aarch64_register
   int is64;
 };
 
+enum aarch64_memory_operand_type
+{
+  MEMORY_OPERAND_OFFSET,
+  MEMORY_OPERAND_PREINDEX,
+  MEMORY_OPERAND_POSTINDEX,
+};
+
 /* Representation of a memory operand, used for load and store
    instructions.
 
@@ -129,12 +136,8 @@ struct aarch64_register
 struct aarch64_memory_operand
 {
   /* Type of the operand.  */
-  enum
-    {
-      MEMORY_OPERAND_OFFSET,
-      MEMORY_OPERAND_PREINDEX,
-      MEMORY_OPERAND_POSTINDEX,
-    } type;
+  enum aarch64_memory_operand_type type;
+
   /* Index from the base register.  */
   int32_t index;
 };