[binutils-gdb] [ARM][gas] fix build breakage with gcc-10 by using correct enum type

Szabolcs Nagy nsz@sourceware.org
Thu Jan 2 13:08:00 GMT 2020


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

commit a65b5de624a20f37f0fed484d6208d014f10a6f8
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Mon Oct 21 16:59:11 2019 +0100

    [ARM][gas] fix build breakage with gcc-10 by using correct enum type
    
    Fixes
    
    ../../gas/config/tc-arm.c: In function 'parse_reg_list':
    ../../gas/config/tc-arm.c:1946:35: error: implicit conversion from 'enum reg_list_els' to 'enum arm_reg_type' [-Werror=enum-conversion]
     1946 |        reg = arm_reg_parse (&str, REGLIST_RN);
          |                                   ^~~~~~~~~~
    
    gas/ChangeLog:
    
    	* config/tc-arm.c (parse_reg_list): Use REG_TYPE_RN instead of
    	REGLIST_RN.

Diff:
---
 gas/ChangeLog       | 5 +++++
 gas/config/tc-arm.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c78b42b..198f787 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-02  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* config/tc-arm.c (parse_reg_list): Use REG_TYPE_RN instead of
+	REGLIST_RN.
+
 2020-01-01  Alan Modra  <amodra@gmail.com>
 
 	Update year range in copyright notice of all files.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index e408117..c4dee10 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1943,7 +1943,7 @@ parse_reg_list (char ** strp, enum reg_list_els etype)
 	      const char apsr_str[] = "apsr";
 	      int apsr_str_len = strlen (apsr_str);
 
-	      reg = arm_reg_parse (&str, REGLIST_RN);
+	      reg = arm_reg_parse (&str, REG_TYPE_RN);
 	      if (etype == REGLIST_CLRM)
 		{
 		  if (reg == REG_SP || reg == REG_PC)



More information about the Binutils-cvs mailing list