From 38cd8a0de838966a045ddef4ad31c715ef720a42 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Fri, 6 May 2016 13:59:03 +0100 Subject: [PATCH] gas/arc: Make member of arc_flags const By making the flgp field of struct arc_flags constant we can remove a place where we cast away the const-ness of a variable. Also, given that the value assigned to this field almost always comes from compile-time constant data, having the field non-constant is probably a bad thing. gas/ChangeLog: * config/tc-arc.c (find_opcode_match): Remove casting away of const. * config/tc-arc.h (struct arc_flags): Make flgp field const. --- gas/ChangeLog | 6 ++++++ gas/config/tc-arc.c | 2 +- gas/config/tc-arc.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index d1d23fe23d2..fba1ab9de13 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2016-05-18 Andrew Burgess + + * config/tc-arc.c (find_opcode_match): Remove casting away of + const. + * config/tc-arc.h (struct arc_flags): Make flgp field const. + 2016-05-18 Andrew Burgess * config/tc-arc.c (md_pcrel_from_section): Use BFD_VMA_FMT where diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c index 5a5e8531f7e..c9d772f1503 100644 --- a/gas/config/tc-arc.c +++ b/gas/config/tc-arc.c @@ -1883,7 +1883,7 @@ find_opcode_match (const struct arc_opcode_hash_entry *entry, if (pflag->flgp != NULL) goto match_failed; cl_matches++; - pflag->flgp = (struct arc_flag_operand *) flg_operand; + pflag->flgp = flg_operand; lnflg--; break; /* goto next flag class and parsed flag. */ } diff --git a/gas/config/tc-arc.h b/gas/config/tc-arc.h index 16f6a0686f4..b61342bc110 100644 --- a/gas/config/tc-arc.h +++ b/gas/config/tc-arc.h @@ -225,7 +225,7 @@ struct arc_flags char name[MAX_FLAG_NAME_LENGTH + 1]; /* Pointer to arc flags. */ - struct arc_flag_operand *flgp; + const struct arc_flag_operand *flgp; }; extern const relax_typeS md_relax_table[]; -- 2.30.2