From e5d70d6b5a5c2832ad199ac1b91f68324b4a12c9 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 25 Oct 2017 21:59:14 +1030 Subject: PR22348, conflicting global vars in crx and cr16 include/ PR 22348 * opcode/cr16.h (instruction): Delete. (cr16_words, cr16_allWords, cr16_currInsn): Delete. * opcode/crx.h (crx_cst4_map): Rename from cst4_map. (crx_cst4_maps): Rename from cst4_maps. (crx_no_op_insn): Rename from no_op_insn. (instruction): Delete. opcodes/ PR 22348 * cr16-dis.c (cr16_cinvs, instruction, cr16_currInsn): Make static. (cr16_words, cr16_allWords, processing_argument_number): Likewise. (imm4flag, size_changed): Likewise. * crx-dis.c (crx_cinvs, NUMCINVS, instruction, currInsn): Likewise. (words, allWords, processing_argument_number): Likewise. (cst4flag, size_changed): Likewise. * crx-opc.c (crx_cst4_map): Rename from cst4_map. (crx_cst4_maps): Rename from cst4_maps. (crx_no_op_insn): Rename from no_op_insn. gas/ PR 22348 * config/tc-crx.c (instruction, output_opcode): Make static. (relocatable, ins_parse, cur_arg_num): Likewise. (parse_insn): Adjust for renamed opcodes globals. (check_range): Likewise --- opcodes/crx-opc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'opcodes/crx-opc.c') diff --git a/opcodes/crx-opc.c b/opcodes/crx-opc.c index f6f2da6..05b661d 100644 --- a/opcodes/crx-opc.c +++ b/opcodes/crx-opc.c @@ -704,15 +704,15 @@ The value in entry is mapped to the value Example (for N=5): cst4_map[5]=-4 -->> 5 */ -const int cst4_map[] = +const int crx_cst4_map[] = { 0, 1, 2, 3, 4, -4, -1, 7, 8, 16, 32, 20, 12, 48 }; -const int cst4_maps = ARRAY_SIZE (cst4_map); +const int crx_cst4_maps = ARRAY_SIZE (crx_cst4_map); /* CRX instructions that don't have arguments. */ -const char* no_op_insn[] = +const char* crx_no_op_insn[] = { "di", "ei", "eiwait", "nop", "retx", "wait", NULL }; -- cgit v1.1