[binutils-gdb] Define enum out of struct

[Yao Qi <qiyao at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6448a3e4daecbdba25e5c76b0fbb0c21583a1347

commit 6448a3e4daecbdba25e5c76b0fbb0c21583a1347
Author: Yao Qi <yao.qi@linaro.org>
Date:   Wed Oct 14 09:23:14 2015 +0100

    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:
---
 gdb/ChangeLog           |  6 ++++++
 gdb/arch/aarch64-insn.h | 15 +++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cabfe36..4b8ffb7 100644
--- 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 d51cabc..cc7ec48 100644
--- 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;
 };