This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: Improvements and fixes for mips n32/n64 relocations
On Apr 10, 2003, Eric Christopher <echristo at redhat dot com> wrote:
> Yes with the change I noticed offline and the one that I missed that cgd
> spotted and the changes you noticed :)
Here's one more problem introduced along with my patch. I'm going
ahead and checking it in, since you approved it in private.
Index: bfd/ChangeLog
from Alexandre Oliva <aoliva at redhat dot com>
* elfxx-mips.c (mips_elf_get_global_gotsym_index): New.
(mips_elf_calculate_relocation): Decay GOT_PAGE/GOT_OFST to
GOT_DISP/addend only if the symbol got a global GOT entry.
Index: bfd/elfxx-mips.c
===================================================================
RCS file: /cvs/uberbaum/bfd/elfxx-mips.c,v
retrieving revision 1.49
diff -u -p -r1.49 elfxx-mips.c
--- bfd/elfxx-mips.c 11 Apr 2003 01:56:49 -0000 1.49
+++ bfd/elfxx-mips.c 12 Apr 2003 00:24:05 -0000
@@ -408,6 +408,7 @@ static asection * mips_elf_rel_dyn_secti
static asection * mips_elf_got_section PARAMS ((bfd *, bfd_boolean));
static struct mips_got_info *mips_elf_got_info
PARAMS ((bfd *, asection **));
+static long mips_elf_get_global_gotsym_index PARAMS ((bfd *abfd));
static bfd_vma mips_elf_local_got_index
PARAMS ((bfd *, bfd *, struct bfd_link_info *, bfd_vma));
static bfd_vma mips_elf_global_got_index
@@ -1707,6 +1708,29 @@ mips_elf_got_info (abfd, sgotp)
return g;
}
+/* Obtain the lowest dynamic index of a symbol that was assigned a
+ global GOT entry. */
+static long
+mips_elf_get_global_gotsym_index (abfd)
+ bfd *abfd;
+{
+ asection *sgot;
+ struct mips_got_info *g;
+
+ if (abfd == NULL)
+ return 0;
+
+ sgot = mips_elf_got_section (abfd, TRUE);
+ if (sgot == NULL || mips_elf_section_data (sgot) == NULL)
+ return 0;
+
+ g = mips_elf_section_data (sgot)->u.got_info;
+ if (g == NULL || g->global_gotsym == NULL)
+ return 0;
+
+ return g->global_gotsym->dynindx;
+}
+
/* Returns the GOT offset at which the indicated address can be found.
If there is not yet a GOT entry for this value, create one. Returns
-1 if no satisfactory GOT offset can be found. */
@@ -3197,9 +3221,12 @@ mips_elf_calculate_relocation (abfd, inp
switch (r_type)
{
case R_MIPS_GOT_PAGE:
- /* If we didn't create a dynamic index for this symbol, it can
- be regarded as local. */
- if (local_p || ! h || h->root.dynindx < 0)
+ /* If this symbol got a global GOT entry, we have to decay
+ GOT_PAGE/GOT_OFST to GOT_DISP/addend. */
+ if (local_p || ! h
+ || (h->root.dynindx
+ < mips_elf_get_global_gotsym_index (elf_hash_table (info)
+ ->dynobj)))
break;
/* Fall through. */
--
Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer aoliva at {redhat dot com, gcc.gnu.org}
CS PhD student at IC-Unicamp oliva at {lsd dot ic dot unicamp dot br, gnu.org}
Free Software Evangelist Professional serial bug killer