2003-03-19 H.J. Lu <hongjiu.lu@intel.com>

	PR ld/4208
	* elfxx-mips.c (_bfd_mips_elf_relocate_section): Report missing
	matching LO16 relocation for HI16 relocation.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 004bfe7436da8a78c1dc35ec15e618aed0722952..e33adfbd76081d8fe9f8ca70d0b4bbd500ac1a79 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/4208
+       * elfxx-mips.c (_bfd_mips_elf_relocate_section): Report missing
+       matching LO16 relocation for HI16 relocation.
+
 2007-03-20  Paul Brook  <paul@codesourcery.com>
 
        * bfd-in.h (bfd_elf32_arm_set_target_relocs): Update prototype.

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 8f73840004b7e8cede4ef54aa40d28d6aca44a0b..40ae730d96ce832a44eb191151d6c2252e4aeda2 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -7756,6 +7756,8 @@ _bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
       const char *msg;
       unsigned long r_symndx;
       asection *sec;
+      Elf_Internal_Shdr *symtab_hdr;
+      struct elf_link_hash_entry *h;
 
       /* Find the relocation howto for this relocation.  */
       howto = MIPS_ELF_RTYPE_TO_HOWTO (input_bfd, r_type,
@@ -7765,15 +7767,16 @@ _bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                                            rel - relocs)));
 
       r_symndx = ELF_R_SYM (input_bfd, rel->r_info);
+      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
       if (mips_elf_local_relocation_p (input_bfd, rel, local_sections, FALSE))
-       sec = local_sections[r_symndx];
+       {
+         sec = local_sections[r_symndx];
+         h = NULL;
+       }
       else
        {
-         Elf_Internal_Shdr *symtab_hdr;
          unsigned long extsymoff;
-         struct elf_link_hash_entry *h;
 
-         symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
          extsymoff = 0;
          if (!elf_bad_symtab (input_bfd))
            extsymoff = symtab_hdr->sh_info;
@@ -7885,7 +7888,21 @@ _bfd_mips_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
                                                              lo16_type,
                                                              rel, relend);
                  if (lo16_relocation == NULL)
-                   return FALSE;
+                   {
+                     const char *name;
+
+                     if (h)
+                       name = h->root.root.string;
+                     else
+                       name = bfd_elf_sym_name (input_bfd, symtab_hdr,
+                                                local_syms + r_symndx,
+                                                sec);
+                     (*_bfd_error_handler)
+                       (_("%B: Can't find matching LO16 reloc against `%s' for %s at 0x%lx in section `%A'"),
+                        input_bfd, input_section, name, howto->name,
+                        rel->r_offset);
+                     return FALSE;
+                   }
 
                  lo16_location = contents + lo16_relocation->r_offset;