bfd/

[deliverable/binutils-gdb.git] / bfd / aoutx.h

diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 4fa529cf5076889996d9d2e3565a1d64c2f59666..d629d80d466e172038cdc00e176846843091a19c 100644 (file)
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -5158,7 +5158,7 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
                const char *name;
 
                if (h != NULL)
-                 name = h->root.root.string;
+                 name = NULL;
                else if (r_extern)
                  name = strings + GET_WORD (input_bfd,
                                             syms[r_index].e_strx);
@@ -5170,8 +5170,9 @@ aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
                    name = bfd_section_name (input_bfd, s);
                  }
                if (! ((*finfo->info->callbacks->reloc_overflow)
-                      (finfo->info, name, howto->name,
-                       (bfd_vma) 0, input_bfd, input_section, r_addr)))
+                      (finfo->info, (h ? &h->root : NULL), name,
+                       howto->name, (bfd_vma) 0, input_bfd,
+                       input_section, r_addr)))
                  return FALSE;
              }
              break;
@@ -5569,7 +5570,7 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
                    const char *name;
 
                    if (h != NULL)
-                     name = h->root.root.string;
+                     name = NULL;
                    else if (r_extern
                             || r_type == (unsigned int) RELOC_BASE10
                             || r_type == (unsigned int) RELOC_BASE13
@@ -5584,7 +5585,8 @@ aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
                        name = bfd_section_name (input_bfd, s);
                      }
                    if (! ((*finfo->info->callbacks->reloc_overflow)
-                          (finfo->info, name, howto_table_ext[r_type].name,
+                          (finfo->info, (h ? &h->root : NULL), name,
+                           howto_table_ext[r_type].name,
                            r_addend, input_bfd, input_section, r_addr)))
                      return FALSE;
                  }
@@ -5753,7 +5755,7 @@ aout_link_reloc_link_order (finfo, o, p)
              abort ();
            case bfd_reloc_overflow:
              if (! ((*finfo->info->callbacks->reloc_overflow)
-                    (finfo->info,
+                    (finfo->info, NULL,
                      (p->type == bfd_section_reloc_link_order
                       ? bfd_section_name (finfo->output_bfd,
                                           pr->u.section)