Change the PLT entry 0 instruction sequence to actually work.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 14896cc5c56449eb19bcba7aaa92b9d17bd25ab3..b3dc5cf3ecd70b7b29db6aaa896f364923dc8fec 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-19  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
+
+       * elf32-m68k.c (elf_cpu32_plt0_entry): Change the PLT entry 0
+       instruction sequence to actually work.
+       (elf_m68k_finish_dynamic_sections): Change the patch-in offset
+       accordingly.
+
 2000-09-18  Alexandre Oliva  <aoliva@redhat.com>
 
        * elf32-sh.c (sh_elf_relocate_section): Use

diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index d53cfdf45a35255c06cc7e4168ab6f644ade97ed..9b5e93f529e58b4bc97a1e3a0b92b0459886c383 100644 (file)
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -224,11 +224,11 @@ static const bfd_byte elf_m68k_plt_entry[PLT_ENTRY_SIZE] =
 /* Procedure linkage table entries for the cpu32 */
 static const bfd_byte elf_cpu32_plt0_entry[PLT_CPU32_ENTRY_SIZE] =
 {
-  0x22, 0x7b, 0x01, 0x70, /* moveal %pc@(0xc), %a1 */
+  0x2f, 0x3b, 0x01, 0x70, /* move.l (%pc,addr),-(%sp) */
   0, 0, 0, 0,             /* replaced with offset to .got + 4.  */
-  0x4e, 0xd1,             /* jmp %a1@ */
+  0x22, 0x7b, 0x01, 0x70, /* moveal %pc@(0xc), %a1 */
   0, 0, 0, 0,             /* replace with offset to .got +8. */
-  0, 0, 0, 0,             /* pad out to 24 bytes.  */
+  0x4e, 0xd1,             /* jmp %a1@ */
   0, 0, 0, 0,             /* pad out to 24 bytes.  */
   0, 0
 };
@@ -2154,7 +2154,7 @@ elf_m68k_finish_dynamic_sections (output_bfd, info)
                          (sgot->output_section->vma
                           + sgot->output_offset + 8
                           - (splt->output_section->vma + 10)),
-                         splt->contents + 10);
+                         splt->contents + 12);
               elf_section_data (splt->output_section)->this_hdr.sh_entsize 
                = PLT_CPU32_ENTRY_SIZE;
             }