* elf32-m32c.c (m32c_elf_relax_delete_bytes): Adjust symbol sizes

if needed.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fd54cb97af1fc5c041f7c115ffb7baa5211541de..ecca9ca072d62e8813d4c66b4b88823513892933 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-13  DJ Delorie  <dj@redhat.com>
+
+       * elf32-m32c.c (m32c_elf_relax_delete_bytes): Adjust symbol sizes
+       if needed.
+
 2009-08-12  Nick Clifton  <nickc@redhat.com>
 
        * po/fi.po: Updated Finnish translation.

diff --git a/bfd/elf32-m32c.c b/bfd/elf32-m32c.c
index 5f45784f36828f240f43ec6136f0cc21adaaf6e2..8805d611a31d308a3d7c523725c1248e54757c85 100644 (file)
--- a/bfd/elf32-m32c.c
+++ b/bfd/elf32-m32c.c
@@ -1951,13 +1951,24 @@ m32c_elf_relax_delete_bytes
 
   for (; isym < isymend; isym++, shndx = (shndx ? shndx + 1 : NULL))
     {
-
+      /* If the symbol is in the range of memory we just moved, we
+        have to adjust its value.  */
       if ((int) isym->st_shndx == sec_shndx
          && isym->st_value > addr
          && isym->st_value < toaddr)
        {
          isym->st_value -= count;
        }
+      /* If the symbol *spans* the bytes we just deleted (i.e. it's
+        *end* is in the moved bytes but it's *start* isn't), then we
+        must adjust its size.  */
+      if ((int) isym->st_shndx == sec_shndx
+           && isym->st_value < addr
+         && isym->st_value + isym->st_size > addr
+         && isym->st_value + isym->st_size < toaddr)
+       {
+         isym->st_size -= count;
+       }
     }
 
   /* Now adjust the global symbols defined in this section.  */
@@ -1972,13 +1983,21 @@ m32c_elf_relax_delete_bytes
       struct elf_link_hash_entry * sym_hash = * sym_hashes;
 
       if (sym_hash &&
-         (   sym_hash->root.type == bfd_link_hash_defined
+         (sym_hash->root.type == bfd_link_hash_defined
           || sym_hash->root.type == bfd_link_hash_defweak)
-         && sym_hash->root.u.def.section == sec
-         && sym_hash->root.u.def.value > addr
-         && sym_hash->root.u.def.value < toaddr)
+         && sym_hash->root.u.def.section == sec)
        {
-         sym_hash->root.u.def.value -= count;
+         if (sym_hash->root.u.def.value > addr
+             && sym_hash->root.u.def.value < toaddr)
+           {
+             sym_hash->root.u.def.value -= count;
+           }
+         if (sym_hash->root.u.def.value < addr
+             && sym_hash->root.u.def.value + sym_hash->size > addr
+             && sym_hash->root.u.def.value + sym_hash->size < toaddr)
+           {
+             sym_hash->size -= count;
+           }
        }
     }