* reloc16.c (bfd_coff_reloc16_relax_section): Count the total number

        of shrinks properly, including the last reloc.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5247acf0c2d3c1984a61e2c440c8049847f19602..e931e32096e18a9602a9b81b272ee949fe538663 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-14  Kazu Hirata  <kazu@hxi.com>
+
+       * reloc16.c (bfd_coff_reloc16_relax_section): Count the total number
+       of shrinks properly, including the last reloc.
+
 2000-03-13  Kazu Hirata  <kazu@hxi.com>
 
        * coff-h8300.c (h8300_reloc16_extra_cases): Fix the sanity

diff --git a/bfd/reloc16.c b/bfd/reloc16.c
index fd8758aec4c5da83291bfcde8b886652339ffe39..0e7c18abfd976bf81df1c8e0dd8c901906e3dbcc 100644 (file)
--- a/bfd/reloc16.c
+++ b/bfd/reloc16.c
@@ -195,9 +195,10 @@ bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
     {
       int another_pass = 0;
 
-      /* Allocate and initialize the shrinks array for this section.  */
-      shrinks = (int *) bfd_malloc (reloc_count * sizeof (int));
-      memset (shrinks, 0, reloc_count * sizeof (int));
+      /* Allocate and initialize the shrinks array for this section.
+         The last element is used as an accumlator of shrinks.  */
+      shrinks = (int *) bfd_malloc ((reloc_count + 1) * sizeof (int));
+      memset (shrinks, 0, (reloc_count + 1) * sizeof (int));
 
       /* Loop until nothing changes in this section.  */
       do {
@@ -219,13 +220,14 @@ bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
            if (shrink != shrinks[i])
              {
                another_pass = 1;
-               for (j = i + 1; j < reloc_count; j++)
+               for (j = i + 1; j <= reloc_count; j++)
                  shrinks[j] += shrink - shrinks[i];
              }
          }
   
       } while (another_pass);
 
+      shrink = shrinks[reloc_count];
       free((char *)shrinks);
     }