Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The GOT is Elf_Addr[], not Elf_Word[]...

This commit is contained in:
mycroft 2002-09-12 18:36:43 +00:00
parent 6f0bda739f
commit 326f270bfb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libexec/ld.elf_so/arch/mips/mips_reloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mips_reloc.c,v 1.19 2002/09/12 18:28:53 mycroft Exp $ */ /* $NetBSD: mips_reloc.c,v 1.20 2002/09/12 18:36:43 mycroft Exp $ */
/* /*
* Copyright 1997 Michael L. Hitch <mhitch@montana.edu> * Copyright 1997 Michael L. Hitch <mhitch@montana.edu>
@ -246,7 +246,7 @@ _rtld_relocate_nonplt_objects(obj, self, dodebug)
i = (got[1] & 0x80000000) ? 2 : 1; i = (got[1] & 0x80000000) ? 2 : 1;
/* Relocate the local GOT entries */ /* Relocate the local GOT entries */
while (i < obj->local_gotno) while (i < obj->local_gotno)
got[i++] += (Elf_Word)obj->relocbase; got[i++] += (Elf_Addr)obj->relocbase;
got += obj->local_gotno; got += obj->local_gotno;
sym = obj->symtab + obj->gotsym; sym = obj->symtab + obj->gotsym;
/* Now do the global GOT entries */ /* Now do the global GOT entries */
@ -259,18 +259,18 @@ _rtld_relocate_nonplt_objects(obj, self, dodebug)
return -1; return -1;
if (sym->st_shndx == SHN_UNDEF || if (sym->st_shndx == SHN_UNDEF ||
sym->st_shndx == SHN_COMMON) sym->st_shndx == SHN_COMMON)
*got = def->st_value + (Elf_Word)defobj->relocbase; *got = def->st_value + (Elf_Addr)defobj->relocbase;
else if (ELF_ST_TYPE(sym->st_info) == STT_FUNC && else if (ELF_ST_TYPE(sym->st_info) == STT_FUNC &&
*got != sym->st_value) *got != sym->st_value)
*got += (Elf_Word)obj->relocbase; *got += (Elf_Addr)obj->relocbase;
else if (ELF_ST_TYPE(sym->st_info) == STT_SECTION && else if (ELF_ST_TYPE(sym->st_info) == STT_SECTION &&
ELF_ST_BIND(sym->st_info) == STB_GLOBAL) { ELF_ST_BIND(sym->st_info) == STB_GLOBAL) {
if (sym->st_shndx == SHN_ABS) if (sym->st_shndx == SHN_ABS)
*got = sym->st_value + *got = sym->st_value +
(Elf_Word)obj->relocbase; (Elf_Addr)obj->relocbase;
/* else SGI stuff ignored */ /* else SGI stuff ignored */
} else } else
*got = def->st_value + (Elf_Word)defobj->relocbase; *got = def->st_value + (Elf_Addr)defobj->relocbase;
++sym; ++sym;
++got; ++got;
} }