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

Fix a commit 5025eb7c0d87 ("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 91d6fa6a035c ("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'.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6f726ae488bbc34ea846deb5aed63ce6987c3b6b..4dc5256feee1d50241992b7fcd5c6f84ae8583dd 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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>
 
        * section.c (BFD_FAKE_SECTION): Reorder parameters.  Formatting.

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 787e570b6d284f73ca8e10014e37b87c32619573..c6bca9e432f12247311b207fbfa3cf0911262e65 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -14948,15 +14948,15 @@ elf32_arm_update_relocs (asection *o,
                {
                  arm_unwind_table_edit *edit_node, *edit_next;
                  bfd_vma bias;
-                 bfd_vma index;
+                 bfd_vma reloc_index;
 
                  (*swap_in) (abfd, erela, irela);
-                 index = (irela->r_offset - offset) / 8;
+                 reloc_index = (irela->r_offset - offset) / 8;
 
                  bias = 0;
                  edit_node = 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)
                    {
                      bias++;
@@ -14964,7 +14964,7 @@ elf32_arm_update_relocs (asection *o,
                    }
 
                  if (edit_node->type != DELETE_EXIDX_ENTRY
-                     || edit_node->index != index)
+                     || edit_node->index != reloc_index)
                    {
                      irela->r_offset -= bias * 8;
                      irela++;