OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM/GAS: Correct an `index' global shadowing error 

Fix a commit 008a97eff0 ("[GAS][ARM]Generate unpredictable warning for
pc used in data processing instructions with register-shifted register
operand.") build regression:

cc1: warnings being treated as errors
.../gas/config/tc-arm.c: In function 'encode_arm_shift':
.../gas/config/tc-arm.c:7439: error: declaration of 'index' shadows a global declaration
/usr/include/string.h:303: error: shadowed declaration is here
make[4]: *** [tc-arm.o] Error 1

in a way following commit 91d6fa6a03 ("Add -Wshadow to the gcc command
line options used when compiling the binutils.").

	gas/
	* config/tc-arm.c (encode_arm_shift): Rename `index' local
	variable to `op_index'.
This commit is contained in:
Maciej W. Rozycki 2016-12-08 22:53:39 +00:00
parent 329d01f70e
commit bf355b690f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gas/ChangeLog
View File

@ -1,3 +1,8 @@
2016-12-08 Maciej W. Rozycki <macro@imgtec.com>
* config/tc-arm.c (encode_arm_shift): Rename `index' local
variable to `op_index'.
2016-12-08 Alan Modra <amodra@gmail.com>
* configure: Regenerate.

8
gas/config/tc-arm.c
View File

@ -7436,14 +7436,14 @@ encode_arm_shift (int i)
/* register-shifted register. */
if (inst.operands[i].immisreg)
{
int index;
for (index = 0; index <= i; ++index)
int op_index;
for (op_index = 0; op_index <= i; ++op_index)
{
/* Check the operand only when it's presented. In pre-UAL syntax,
if the destination register is the same as the first operand, two
register form of the instruction can be used. */
if (inst.operands[index].present && inst.operands[index].isreg
&& inst.operands[index].reg == REG_PC)
if (inst.operands[op_index].present && inst.operands[op_index].isreg
&& inst.operands[op_index].reg == REG_PC)
as_warn (UNPRED_REG ("r15"));
}