* elf32-mips.c (_bfd_mips_elf_final_link): Restore setting of GP

 	removed in previous change.
	(_bfd_mips_elf_relocate_section): Adjust GP relative relocations
 	in relocateable output.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 56f77acad033be87b771d8614193b6510fedcfdb..5799370316fed6cc1acd3a50a00ff76e192fa449 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jul 19 14:03:44 1999  Mark P. Mitchell  <mark@codesourcery.com>
+
+       * elf32-mips.c (_bfd_mips_elf_final_link): Restore setting of GP
+       removed in previous change.
+       (_bfd_mips_elf_relocate_section): Adjust GP relative relocations
+       in relocateable output.
+
 1999-07-19  Ian Lance Taylor  <ian@zembu.com>
 
        * coff-m88k.c (m88kbcs_vec): Initialize new field of bfd_target

diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 8fecccf062daddd906cc51ae94b095e8850bdc82..9ae6e6d33509b582622ce4514facdc93286fb2a9 100644 (file)
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -4388,6 +4388,20 @@ _bfd_mips_elf_final_link (abfd, info)
        elf_gp (abfd) = (h->u.def.value
                         + h->u.def.section->output_section->vma
                         + h->u.def.section->output_offset);
+      else if (info->relocateable)
+       {
+         bfd_vma lo;
+
+         /* Find the GP-relative section with the lowest offset.  */
+         lo = (bfd_vma) -1;
+         for (o = abfd->sections; o != (asection *) NULL; o = o->next)
+           if (o->vma < lo 
+               && (elf_section_data (o)->this_hdr.sh_flags & SHF_MIPS_GPREL))
+             lo = o->vma;
+
+         /* And calculate GP relative to that.  */
+         elf_gp (abfd) = lo + ELF_MIPS_GP_OFFSET (abfd);
+       }
       else
        {
          /* If the relocate_section function needs to do a reloc
@@ -6530,9 +6544,11 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
          unsigned long r_symndx;
 
          /* Since we're just relocating, all we need to do is copy
-            the relocations back out to the object file, unless they're 
-            against a section symbol, in which case we need to adjust 
-            by the section offset.  */
+            the relocations back out to the object file, unless
+            they're against a section symbol, in which case we need
+            to adjust by the section offset, or unless they're GP
+            relative in which case we need to adjust by the amount
+            that we're adjusting GP in this relocateable object.  */
 
          if (!mips_elf_local_relocation_p (input_bfd, rel, local_sections))
            /* A non-local relocation is never against a section.  */
@@ -6540,17 +6556,23 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
 
          r_symndx = ELF32_R_SYM (rel->r_info);
          sym = local_syms + r_symndx;
-         if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
-           continue;
-
-         /* Adjust the addend appropriately.  */
-         addend += local_sections[r_symndx]->output_offset;
+         if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+           {
+             /* Adjust the addend appropriately.  */
+             addend += local_sections[r_symndx]->output_offset;
 
-         /* If the relocation is for a R_MIPS_HI16 or R_MIPS_GOT16,
+             /* If the relocation is for a R_MIPS_HI16 or R_MIPS_GOT16,
             then we only want to write out the high-order 16 bits.
             The subsequent R_MIPS_LO16 will handle the low-order bits.  */
-         if (r_type == R_MIPS_HI16 || r_type == R_MIPS_GOT16)
-           addend >>= 16;
+             if (r_type == R_MIPS_HI16 || r_type == R_MIPS_GOT16)
+               addend >>= 16;
+           }
+         
+         if (r_type == R_MIPS16_GPREL 
+             || r_type == R_MIPS_GPREL16
+             || r_type == R_MIPS_GPREL32)
+           addend -= (_bfd_get_gp_value (output_bfd)
+                      - _bfd_get_gp_value (input_bfd));
 
          if (rela_relocation_p)
            /* If this is a RELA relocation, just update the addend.