2001-12-18 H.J. Lu <hjl@gnu.org>

[platform/upstream/binutils.git] / bfd / elf32-arm.h

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 838c24f..d5cfcd4 100644 (file)
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -1116,6 +1116,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
       /* When generating a shared object, these relocations are copied
         into the output file to be resolved at run time.  */
       if (info->shared
+         && r_symndx != 0
          && (r_type != R_ARM_PC24
              || (h != NULL
                  && h->dynindx != -1
@@ -1148,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);
 
@@ -1857,9 +1847,49 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
        {
          sym = local_syms + r_symndx;
          sec = local_sections[r_symndx];
+#ifdef USE_REL
          relocation = (sec->output_section->vma
                        + sec->output_offset
                        + sym->st_value);
+         if ((sec->flags & SEC_MERGE)
+                  && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+           {
+             asection *msec;
+             bfd_vma addend, value;
+
+             if (howto->rightshift)
+               {
+                 (*_bfd_error_handler)
+                   (_("%s(%s+0x%lx): %s relocation against SEC_MERGE section"),
+                    bfd_archive_filename (input_bfd),
+                    bfd_get_section_name (input_bfd, input_section),
+                    (long) rel->r_offset, howto->name);
+                 return false;
+               }
+
+             value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+             /* Get the (signed) value from the instruction.  */
+             addend = value & howto->src_mask;
+             if (addend & ((howto->src_mask + 1) >> 1))
+               {
+                 bfd_signed_vma mask;
+
+                 mask = -1;
+                 mask &= ~ howto->src_mask;
+                 addend |= mask;
+               }
+             msec = sec;
+             addend =
+               _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);
+             bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+           }
+#else
+         relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sec, rel);
+#endif
        }
       else
        {
@@ -2239,14 +2269,20 @@ Error: %s uses %s floating point, whereas %s uses %s floating point"),
       /* Interworking mismatch is only a warning.  */
       if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))
        {
-         char *s1 = (in_flags & EF_ARM_INTERWORK
-                     ? _("supports") : _("does not support"));
-         char *s2 = out_flags & EF_ARM_INTERWORK ? _("does") : _("does not");
-
-         _bfd_error_handler (_("\
-Warning: %s %s interworking, whereas %s %s"),
-                             bfd_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
+         if (in_flags & EF_ARM_INTERWORK)
+           {
+             _bfd_error_handler (_("\
+Warning: %s supports interworking, whereas %s does not"),
+                                 bfd_archive_filename (ibfd),
+                                 bfd_get_filename (obfd));    
+           }
+         else
+           {
+             _bfd_error_handler (_("\
+Warning: %s does not support interworking, whereas %s does"),
+                                 bfd_archive_filename (ibfd),
+                                 bfd_get_filename (obfd));
+           }
        }
     }
 
@@ -2419,14 +2455,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;
 }