* elf32-arm.h (elf32_arm_size_dynamic_sections): When removing

[deliverable/binutils-gdb.git] / bfd / elf32-arm.h

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 3ef2c197d9b90d20c9dda461abf7c2b6ae891b30..9d0a405a8296524690f65ab2fef08e47243c5997 100644 (file)
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -1,5 +1,5 @@
 /* 32-bit ELF support for ARM
-   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -1149,22 +1149,11 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 
          skip = false;
 
-         if (elf_section_data (input_section)->stab_info == NULL)
-           outrel.r_offset = rel->r_offset;
-         else
-           {
-             bfd_vma off;
-
-             off = (_bfd_stab_section_offset
-                    (output_bfd, &elf_hash_table (info)->stab_info,
-                     input_section,
-                     & elf_section_data (input_section)->stab_info,
-                     rel->r_offset));
-             if (off == (bfd_vma) -1)
-               skip = true;
-             outrel.r_offset = off;
-           }
-
+         outrel.r_offset =
+           _bfd_elf_section_offset (output_bfd, info, input_section,
+                                    rel->r_offset);
+         if (outrel.r_offset == (bfd_vma) -1)
+           skip = true;
          outrel.r_offset += (input_section->output_section->vma
                              + input_section->output_offset);
 
@@ -1510,6 +1499,47 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
       }
       break;
 
+    case R_ARM_THM_PC11:
+      /* Thumb B (branch) instruction).  */
+      {
+       bfd_vma        relocation;
+       bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+       bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
+       bfd_vma        check;
+       bfd_signed_vma signed_check;
+
+#ifdef USE_REL
+       /* Need to refetch addend.  */
+       addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
+       /* ??? Need to determine shift amount from operand size.  */
+       addend >>= howto->rightshift;
+#endif
+       relocation = value + addend;
+
+       relocation -= (input_section->output_section->vma
+                      + input_section->output_offset
+                      + rel->r_offset);
+
+       check = relocation >> howto->rightshift;
+
+       /* If this is a signed value, the rightshift just
+          dropped leading 1 bits (assuming twos complement).  */
+       if ((bfd_signed_vma) relocation >= 0)
+         signed_check = check;
+       else
+         signed_check = check | ~((bfd_vma) -1 >> howto->rightshift);
+
+       relocation |= (bfd_get_16 (input_bfd, hit_data) & (~ howto->dst_mask));
+ 
+       bfd_put_16 (input_bfd, relocation, hit_data);
+
+       /* Assumes two's complement.  */
+       if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
+         return bfd_reloc_overflow;
+
+       return bfd_reloc_ok;
+      }
+      
     case R_ARM_GNU_VTINHERIT:
     case R_ARM_GNU_VTENTRY:
       return bfd_reloc_ok;
@@ -1892,9 +1922,7 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                }
              msec = sec;
              addend =
-               _bfd_merged_section_offset (output_bfd, &msec,
-                                           elf_section_data (sec)->merge_info,
-                                           sym->st_value + addend, (bfd_vma) 0)
+               _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend)
                - relocation;
              addend += msec->output_section->vma + msec->output_offset;
              value = (value & ~ howto->dst_mask) | (addend & howto->dst_mask);
@@ -2255,26 +2283,34 @@ Error: %s compiled for APCS-%d, whereas %s is compiled for APCS-%d"),
 
       if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
        {
-         char *s1 = in_flags  & EF_ARM_APCS_FLOAT ? _("float") : _("integer");
-         char *s2 = out_flags & EF_ARM_APCS_FLOAT ? _("float") : _("integer");
+         if (in_flags & EF_ARM_APCS_FLOAT)
+           _bfd_error_handler (_("\
+Error: %s passes floats in FP registers, whereas %s passes them in integer registers"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+         else
+           _bfd_error_handler (_("\
+Error: %s passes floats in integer registers, whereas %s passes them in FP registers"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
 
-         _bfd_error_handler (_("\
-Error: %s passes floats in %s registers, whereas %s passes them in %s registers"),
-                             bfd_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
          flags_compatible = false;
        }
 
 #ifdef EF_ARM_SOFT_FLOAT
       if ((in_flags & EF_ARM_SOFT_FLOAT) != (out_flags & EF_ARM_SOFT_FLOAT))
        {
-         char *s1 = in_flags  & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard");
-         char *s2 = out_flags & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard");
+         if (in_flags & EF_ARM_SOFT_FLOAT)
+           _bfd_error_handler (_ ("\
+Error: %s uses software FP, whereas %s uses hardware FP"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+         else
+           _bfd_error_handler (_ ("\
+Error: %s uses hardware FP, whereas %s uses software FP"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
 
-         _bfd_error_handler (_ ("\
-Error: %s uses %s floating point, whereas %s uses %s floating point"),
-                             bfd_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
          flags_compatible = false;
        }
 #endif
@@ -2468,14 +2504,9 @@ elf32_arm_gc_mark_hook (abfd, info, rel, h, sym)
      }
    else
      {
-       if (!(elf_bad_symtab (abfd)
-           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-                && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (abfd, sym->st_shndx);
-          }
-      }
+       return bfd_section_from_elf_index (abfd, sym->st_shndx);
+     }
+
   return NULL;
 }
 
@@ -3139,12 +3170,16 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
          asection ** spp;
 
          for (spp = &s->output_section->owner->sections;
-              *spp != s->output_section;
+              *spp != NULL;
               spp = &(*spp)->next)
-           ;
-         *spp = s->output_section->next;
-         --s->output_section->owner->section_count;
-
+           {
+             if (*spp == s->output_section)
+               {
+                 bfd_section_list_remove (s->output_section->owner, spp);
+                 --s->output_section->owner->section_count;
+                 break;
+               }
+           }
          continue;
        }