Arm64: fix build with old glibc

Some old glibc versions have string.h surface "index", which some
compilers then warn about if shadowed by a local variable. Re-use an
existing variable instead.
This commit is contained in:
Jan Beulich 2019-11-11 13:27:47 +01:00
parent 6f485ad416
commit 4f5fc85d6c
2 changed files with 12 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2019-11-11 Jan Beulich <jbeulich@suse.com>
* aarch64-opc.c (operand_general_constraint_met_p): Replace
"index" local variable by that of the already existing "num".
2019-11-08 H.J. Lu <hongjiu.lu@intel.com>
PR gas/25167

View File

@ -2546,17 +2546,14 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
case AARCH64_OPND_SVE_SHRIMM_PRED:
case AARCH64_OPND_SVE_SHRIMM_UNPRED:
case AARCH64_OPND_SVE_SHRIMM_UNPRED_22:
num = (type == AARCH64_OPND_SVE_SHRIMM_UNPRED_22) ? 2 : 1;
size = aarch64_get_qualifier_esize (opnds[idx - num].qualifier);
if (!value_in_range_p (opnd->imm.value, 1, 8 * size))
{
unsigned int index =
(type == AARCH64_OPND_SVE_SHRIMM_UNPRED_22) ? 2 : 1;
size = aarch64_get_qualifier_esize (opnds[idx - index].qualifier);
if (!value_in_range_p (opnd->imm.value, 1, 8 * size))
{
set_imm_out_of_range_error (mismatch_detail, idx, 1, 8*size);
return 0;
}
break;
}
set_imm_out_of_range_error (mismatch_detail, idx, 1, 8*size);
return 0;
}
break;
default:
break;