From: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
Date: Sat, 4 Jun 2016 21:56:32 +0000 (-0400)
Subject: aarch64: make the type of reg_entry::type aarch64_reg_type
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a0b252a9bf7f9985ce6c16c932ad11f847ae2da;p=binutils-gdb.git

aarch64: make the type of reg_entry::type aarch64_reg_type

gas/ChangeLog:

2016-06-25  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>

	* config/tc-aarch64.c: Make the type of reg_entry::type
	aarch_reg_type.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8df0d8f76e5..30bd8be2756 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-25  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* config/tc-aarch64.c: Make the type of reg_entry::type
+	aarch_reg_type.
+
 2016-06-25  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
 
 	* config/tc-bfin.c (bfin_cpus): Remove sentinal.
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index 3bc657ae043..ddc40f28f26 100644
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -247,15 +247,6 @@ struct reloc_entry
   bfd_reloc_code_real_type reloc;
 };
 
-/* Structure for a hash table entry for a register.  */
-typedef struct
-{
-  const char *name;
-  unsigned char number;
-  unsigned char type;
-  unsigned char builtin;
-} reg_entry;
-
 /* Macros to define the register types and masks for the purpose
    of parsing.  */
 
@@ -301,7 +292,7 @@ typedef struct
 #define MULTI_REG_TYPE(T,V)	BASIC_REG_TYPE(T)
 
 /* Register type enumerators.  */
-typedef enum
+typedef enum aarch64_reg_type_
 {
   /* A list of REG_TYPE_*.  */
   AARCH64_REG_TYPES
@@ -314,6 +305,15 @@ typedef enum
 #undef MULTI_REG_TYPE
 #define MULTI_REG_TYPE(T,V)	V,
 
+/* Structure for a hash table entry for a register.  */
+typedef struct
+{
+  const char *name;
+  unsigned char number;
+  ENUM_BITFIELD (aarch64_reg_type_) type : 8;
+  unsigned char builtin;
+} reg_entry;
+
 /* Values indexed by aarch64_reg_type to assist the type checking.  */
 static const unsigned reg_type_masks[] =
 {