*** empty log message ***

[deliverable/binutils-gdb.git] / bfd / elf32-i386.c

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 60c0f45b6749c9b4b57b91219f30dcfd172cd746..844138f31edf66a43eca5e1bf7f9c1f1edbffeae 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -200,7 +200,7 @@ elf_i386_info_to_howto_rel (abfd, cache_ptr, dst)
 /* The first entry in an absolute procedure linkage table looks like
    this.  See the SVR4 ABI i386 supplement to see how this works.  */
 
-static bfd_byte elf_i386_plt0_entry[PLT_ENTRY_SIZE] =
+static const bfd_byte elf_i386_plt0_entry[PLT_ENTRY_SIZE] =
 {
   0xff, 0x35,  /* pushl contents of address */
   0, 0, 0, 0,  /* replaced with address of .got + 4.  */
@@ -212,7 +212,7 @@ static bfd_byte elf_i386_plt0_entry[PLT_ENTRY_SIZE] =
 /* Subsequent entries in an absolute procedure linkage table look like
    this.  */
 
-static bfd_byte elf_i386_plt_entry[PLT_ENTRY_SIZE] =
+static const bfd_byte elf_i386_plt_entry[PLT_ENTRY_SIZE] =
 {
   0xff, 0x25,  /* jmp indirect */
   0, 0, 0, 0,  /* replaced with address of this symbol in .got.  */
@@ -224,7 +224,7 @@ static bfd_byte elf_i386_plt_entry[PLT_ENTRY_SIZE] =
 
 /* The first entry in a PIC procedure linkage table look like this.  */
 
-static bfd_byte elf_i386_pic_plt0_entry[PLT_ENTRY_SIZE] =
+static const bfd_byte elf_i386_pic_plt0_entry[PLT_ENTRY_SIZE] =
 {
   0xff, 0xb3, 4, 0, 0, 0,      /* pushl 4(%ebx) */     
   0xff, 0xa3, 8, 0, 0, 0,      /* jmp *8(%ebx) */      
@@ -233,7 +233,7 @@ static bfd_byte elf_i386_pic_plt0_entry[PLT_ENTRY_SIZE] =
 
 /* Subsequent entries in a PIC procedure linkage table look like this.  */
 
-static bfd_byte elf_i386_pic_plt_entry[PLT_ENTRY_SIZE] =
+static const bfd_byte elf_i386_pic_plt_entry[PLT_ENTRY_SIZE] =
 {
   0xff, 0xa3,  /* jmp *offset(%ebx) */
   0, 0, 0, 0,  /* replaced with offset of this symbol in .got.  */
@@ -647,11 +647,13 @@ elf_i386_adjust_dynamic_symbol (info, h)
       if (s->_raw_size == 0)
        s->_raw_size += PLT_ENTRY_SIZE;
 
-      /* If we are not generating a shared library, or if the symbol
-         is not defined, set the symbol to this location in the .plt.
-         This is required to make function pointers compare as equal
-         between the normal executable and the shared library.  */
-      if (! info->shared || h->root.type != bfd_link_hash_defined)
+      /* If this symbol is not defined in a regular file, and we are
+        not generating a shared library, then set the symbol to this
+        location in the .plt.  This is required to make function
+        pointers compare as equal between the normal executable and
+        the shared library.  */
+      if (! info->shared
+         && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
        {
          h->root.u.def.section = s;
          h->root.u.def.value = s->_raw_size;
@@ -971,7 +973,7 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
   for (; rel < relend; rel++)
     {
       int r_type;
-      const reloc_howto_type *howto;
+      reloc_howto_type *howto;
       long r_symndx;
       struct elf_link_hash_entry *h;
       Elf_Internal_Sym *sym;
@@ -1030,9 +1032,25 @@ elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
          if (h->root.type == bfd_link_hash_defined)
            {
              sec = h->root.u.def.section;
-             relocation = (h->root.u.def.value
-                           + sec->output_section->vma
-                           + sec->output_offset);
+             if (r_type == R_386_GOTPC
+                 || (r_type == R_386_PLT32
+                     && h->plt_offset != (bfd_vma) -1)
+                 || (r_type == R_386_GOT32
+                     && elf_hash_table (info)->dynamic_sections_created)
+                 || (info->shared
+                     && (r_type == R_386_32
+                         || r_type == R_386_PC32)
+                     && (input_section->flags & SEC_ALLOC) != 0))
+               {
+                 /* In these cases, we don't need the relocation
+                     value.  We check specially because in some
+                     obscure cases sec->output_section will be NULL.  */
+                 relocation = 0;
+               }
+             else
+               relocation = (h->root.u.def.value
+                             + sec->output_section->vma
+                             + sec->output_offset);
            }
          else if (h->root.type == bfd_link_hash_weak)
            relocation = 0;