summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2019-10-21 16:59:11 +0100
committerSzabolcs Nagy <szabolcs.nagy@arm.com>2020-01-13 15:49:26 +0000
commitc06868784d819a45c43947180c69e168aecaf368 (patch)
tree05e6ab8439f8489f450ba11628fd19da40986ffd
parent75d04843439abaa43cd581e8357cbe5cf93a0926 (diff)
downloadbinutils-gdb-c06868784d819a45c43947180c69e168aecaf368.tar.gz
[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: Backported from mainline. 2020-01-02 Szabolcs Nagy <szabolcs.nagy@arm.com> * config/tc-arm.c (parse_reg_list): Use REG_TYPE_RN instead of REGLIST_RN.
-rw-r--r--gas/ChangeLog8
-rw-r--r--gas/config/tc-arm.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index fcb5592f9fa..81f066d6d77 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2020-01-13 Szabolcs Nagy <szabolcs.nagy@arm.com>
+
+ Backported from mainline.
+ 2020-01-02 Szabolcs Nagy <szabolcs.nagy@arm.com>
+
+ * config/tc-arm.c (parse_reg_list): Use REG_TYPE_RN instead of
+ REGLIST_RN.
+
2019-12-06 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
Backported from mainline.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index caabdbba90d..9910572fd9e 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1868,7 +1868,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)