FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix a commit 5025eb7c0d ("Delete relocations associatesd with deleted
exidx entries.") build regression:

cc1: warnings being treated as errors
.../bfd/elf32-arm.c: In function 'elf32_arm_update_relocs':
.../bfd/elf32-arm.c:14951: warning: declaration of 'index' shadows a global declaration
/usr/include/string.h:304: warning: shadowed declaration is here
make[3]: *** [elf32-arm.lo] Error 1

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

	bfd/
	* elf32-arm.c (elf32_arm_update_relocs): Rename `index' local
	variable to `reloc_index'.
This commit is contained in:
Maciej W. Rozycki 2016-10-18 04:28:34 +01:00
parent b252dcee39
commit c48182bfe4
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2016-10-18 Maciej W. Rozycki <macro@imgtec.com>
* elf32-arm.c (elf32_arm_update_relocs): Rename `index' local
variable to `reloc_index'.
2016-10-12 Alan Modra <amodra@gmail.com> 2016-10-12 Alan Modra <amodra@gmail.com>
* section.c (BFD_FAKE_SECTION): Reorder parameters. Formatting. * section.c (BFD_FAKE_SECTION): Reorder parameters. Formatting.

8
bfd/elf32-arm.c
View file

@ -14948,15 +14948,15 @@ elf32_arm_update_relocs (asection *o,
{ {
arm_unwind_table_edit *edit_node, *edit_next; arm_unwind_table_edit *edit_node, *edit_next;
bfd_vma bias; bfd_vma bias;
bfd_vma index; bfd_vma reloc_index;
(*swap_in) (abfd, erela, irela); (*swap_in) (abfd, erela, irela);
index = (irela->r_offset - offset) / 8; reloc_index = (irela->r_offset - offset) / 8;
bias = 0; bias = 0;
edit_node = edit_list; edit_node = edit_list;
for (edit_next = edit_list; for (edit_next = edit_list;
edit_next && edit_next->index <= index; edit_next && edit_next->index <= reloc_index;
edit_next = edit_node->next) edit_next = edit_node->next)
{ {
bias++; bias++;
@ -14964,7 +14964,7 @@ elf32_arm_update_relocs (asection *o,
} }
if (edit_node->type != DELETE_EXIDX_ENTRY if (edit_node->type != DELETE_EXIDX_ENTRY
|| edit_node->index != index) || edit_node->index != reloc_index)
{ {
irela->r_offset -= bias * 8; irela->r_offset -= bias * 8;
irela++; irela++;