From 26cdfd92055ece05e1abb5248ddb78f3386f857b Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Fri, 1 Apr 2016 18:35:29 +0100 Subject: [PATCH] gas/arc: Use #define from include/opcode/arc.h In tc-arc.h we redefine constants that are also defined in the include/opcode/arc.h header file. The problem is that changing one without changing the other resulting in strange crashes. We could comment both locations to stress the importance of remembering to update the other location too, or we could just include the opcode/arc.h header file into the assembler. Given that other targets include their opcode/ARCH.h header file, and only having a single definition, where possible, is usually the safest solution, that's what I switch too with this commit. gas/ChangeLog: * config/tc-arc.h: Include 'opcode/arc.h'. (MAX_INSN_ARGS): Delete. (MAX_INSN_FLGS): Delete. --- gas/ChangeLog | 6 ++++++ gas/config/tc-arc.h | 9 +-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 615921843bb..46ce10d2964 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2016-04-04 Andrew Burgess + + * config/tc-arc.h: Include 'opcode/arc.h'. + (MAX_INSN_ARGS): Delete. + (MAX_INSN_FLGS): Delete. + 2016-04-04 Alan Modra PR 19498 diff --git a/gas/config/tc-arc.h b/gas/config/tc-arc.h index 93a7d77ac19..7c193fec9d9 100644 --- a/gas/config/tc-arc.h +++ b/gas/config/tc-arc.h @@ -20,6 +20,7 @@ Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "opcode/arc.h" /* By convention, you should define this macro in the `.h' file. For example, `tc-m68k.h' defines `TC_M68K'. You might have to use this @@ -221,14 +222,6 @@ struct arc_flags unsigned char code; }; -#ifndef MAX_INSN_ARGS -#define MAX_INSN_ARGS 6 -#endif - -#ifndef MAX_INSN_FLGS -#define MAX_INSN_FLGS 3 -#endif - extern const relax_typeS md_relax_table[]; #define TC_GENERIC_RELAX_TABLE md_relax_table -- 2.30.2