* elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Declare and use

	local variable i_ instead of assuming and using a variable i.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7eedaae66cd7d4e7386b527154aba4b24dca3222..455a1247ed7fa86cc775c9eb861afa18b8d29b0f 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-07  Hans-Peter Nilsson  <hp@axis.com>
+
+       * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Declare and use
+       local variable i_ instead of assuming and using a variable i.
+
 2012-05-07  Maciej W. Rozycki  <macro@linux-mips.org>
 
        * elf-bfd.h (RELOC_AGAINST_DISCARDED_SECTION): Handle compound

diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
index a016d473c26550dc921ad4b2f56244044479c83e..5af46dcf5d39b4dd28d53f8975f27d9d3cbf600f 100644 (file)
--- a/bfd/elf-bfd.h
+++ b/bfd/elf-bfd.h
@@ -2411,6 +2411,7 @@ extern asection _bfd_elf_large_com_section;
                                        rel, count, relend,             \
                                        howto, index, contents)         \
   {                                                                    \
+    int i_;                                                            \
     _bfd_clear_contents (howto, input_bfd, input_section,              \
                         contents + rel[index].r_offset);               \
                                                                        \
@@ -2440,10 +2441,10 @@ extern asection _bfd_elf_large_com_section;
          }                                                             \
       }                                                                        \
                                                                        \
-    for (i = 0; i < count; i++)                                                \
+    for (i_ = 0; i_ < count; i_++)                                     \
       {                                                                        \
-       rel[i].r_info = 0;                                              \
-       rel[i].r_addend = 0;                                            \
+       rel[i_].r_info = 0;                                             \
+       rel[i_].r_addend = 0;                                           \
       }                                                                        \
     rel += count - 1;                                                  \
     continue;                                                          \