Fix typo in eabl relocations

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b821ac7853a5b4f5af9daa1658765aae9f66dd48..a0e0e1c4793cf4f8c4dc05b724e7ed2d9f9cceb8 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 24 20:40:26 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
+
+       * elf32-ppc.c (ppc_elf_relocate_section): Fix typo in eabi
+       relocations.
+
 Wed Jan 24 10:38:34 1996  Doug Evans  <dje@charmed.cygnus.com>
 
        * elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Delete checking

diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
index 541aadf8ebc2a84abc5e439c6b7e20c382feaf1b..1b7612abc5de62becd6febe487289dd0c9416366 100644 (file)
--- a/bfd/elf32-ppc.c
+++ b/bfd/elf32-ppc.c
@@ -138,6 +138,14 @@ static boolean ppc_elf_relocate_section PARAMS ((bfd *,
                                                 Elf_Internal_Sym *local_syms,
                                                 asection **));
 
+static boolean ppc_elf_add_symbol_hook  PARAMS ((bfd *,
+                                                struct bfd_link_info *,
+                                                const Elf_Internal_Sym *,
+                                                const char **,
+                                                flagword *,
+                                                asection **,
+                                                bfd_vma *));
+
 static boolean ppc_elf_finish_dynamic_symbol PARAMS ((bfd *,
                                                      struct bfd_link_info *,
                                                      struct elf_link_hash_entry *,
@@ -1739,6 +1747,37 @@ ppc_elf_check_relocs (abfd, info, sec, relocs)
   return true;
 }
 
+\f
+/* Hook called by the linker routine which adds symbols from an object
+   file.  We use it to put .comm items in .sbss, and not .bss.  */
+
+/*ARGSUSED*/
+static boolean
+ppc_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
+     bfd *abfd;
+     struct bfd_link_info *info;
+     const Elf_Internal_Sym *sym;
+     const char **namep;
+     flagword *flagsp;
+     asection **secp;
+     bfd_vma *valp;
+{
+  if (sym->st_shndx == SHN_COMMON && sym->st_size <= 8)
+    {
+      /* Common symbols less than or equal to 8 bytes are automatically
+        put into .sdata.  */
+      bfd *dynobj = elf_hash_table (info)->dynobj;
+      elf_linker_section_t *sdata = elf_linker_section (dynobj, LINKER_SECTION_SDATA);
+      if (!sdata->bss_section)
+       sdata->bss_section = bfd_make_section (dynobj, sdata->bss_name);
+      *secp = sdata->bss_section;
+      (*secp)->flags |= SEC_IS_COMMON;
+      *valp = sym->st_size;
+    }
+
+  return true;
+}
+
 \f
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
@@ -2227,8 +2266,8 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
              ret = false;
              continue;
            }
-         addend -= sdata->sym_hash->root.u.def.value;
-         relocation = sdata->sym_hash->root.u.def.section->output_section->vma - relocation;
+         addend -= (sdata->sym_hash->root.u.def.value
+                    + sdata->sym_hash->root.u.def.section->output_section->vma);
          break;
 
 
@@ -2247,8 +2286,8 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
              ret = false;
              continue;
            }
-         addend -= sdata2->sym_hash->root.u.def.value;
-         relocation = sdata2->sym_hash->root.u.def.section->output_section->vma - relocation;
+         addend -= (sdata2->sym_hash->root.u.def.value
+                    + sdata2->sym_hash->root.u.def.section->output_section->vma);
          break;
 
 
@@ -2263,15 +2302,15 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
            if (strcmp (name, ".sdata") == 0 || strcmp (name, ".sbss") == 0)
              {
                reg = 13;
-               addend -= sdata->sym_hash->root.u.def.value;
-               relocation = sdata->sym_hash->root.u.def.section->output_section->vma - relocation;
+               addend -= (sdata->sym_hash->root.u.def.value
+                          + sdata->sym_hash->root.u.def.section->output_section->vma);
              }
 
            else if (strcmp (name, ".sdata2") == 0 || strcmp (name, ".sbss2") == 0)
              {
                reg = 2;
-               addend -= sdata2->sym_hash->root.u.def.value;
-               relocation = sdata2->sym_hash->root.u.def.section->output_section->vma - relocation;
+               addend -= (sdata2->sym_hash->root.u.def.value
+                          + sdata2->sym_hash->root.u.def.section->output_section->vma);
              }
 
            else if (strcmp (name, ".PPC.EMB.sdata0") == 0 || strcmp (name, ".PPC.EMB.sbss0") == 0)
@@ -2429,6 +2468,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 #define elf_backend_create_dynamic_sections    _bfd_elf_create_dynamic_sections
 #define elf_backend_check_relocs               ppc_elf_check_relocs
 #define elf_backend_adjust_dynamic_symbol      ppc_elf_adjust_dynamic_symbol
+#define elf_backend_add_symbol_hook            ppc_elf_add_symbol_hook
 #define elf_backend_size_dynamic_sections      ppc_elf_size_dynamic_sections
 #define elf_backend_finish_dynamic_symbol      ppc_elf_finish_dynamic_symbol
 #define elf_backend_finish_dynamic_sections    ppc_elf_finish_dynamic_sections