frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #3109: Handle R_ALPHA_BRSGP relocations in elfloader. (Sergey Tikhonov)

This commit is contained in:
Adam Jackson 2005-04-23 19:01:13 +00:00
parent 0e80fe0e60
commit 139f900c56
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/loader/elf.h
View File

@ -273,6 +273,7 @@ extern Elf32_Dyn _DYNAMIC[];
#define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */ #define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */
#define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */ #define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */
#define R_ALPHA_RELATIVE 27 /* Adjust by program base */ #define R_ALPHA_RELATIVE 27 /* Adjust by program base */
#define R_ALPHA_BRSGP 28 /* Calc displacement for BRS */
/* IA-64 relocations. */ /* IA-64 relocations. */
#define R_IA64_NONE 0x00 /* none */ #define R_IA64_NONE 0x00 /* none */

51
hw/xfree86/loader/elfloader.c
View File

@ -1623,6 +1623,57 @@ Elf_RelocateEntry(ELFModulePtr elffile, Elf_Word secn, Elf_Rel_t *rel,
break; break;
} }
case R_ALPHA_BRSGP:
{
Elf_Sym *syms;
int Delta;
dest32 = (unsigned int *)((secp + rel->r_offset) + rel->r_addend);
# ifdef ELFDEBUG
ELFDEBUF("R_ALPHA_BRSGP %s\t",
ElfGetSymbolName(elffile, ELF_R_SYM(rel->r_info)));
ELFDEBUG("secp=%lx\t", secp);
ELFDEBUG("symval=%lx\t", symval);
ELFDEBUG("dest32=%lx\t", dest32);
ELFDEBUG("*dest32=%8.8x\t", *dest32);
# endif
# ifdef ELFDEBUG
ELFDEBUG("symval=%lx\t", symval);
# endif
syms = (Elf_Sym *) elffile->saddr[elffile->symndx];
if (syms[ELF_R_SYM(rel->r_info)].st_other & 0x8)
Delta = -4;
else
Delta = 4;
symval -= (Elf_Addr) (((unsigned char *)dest32) + Delta);
if (symval % 4) {
ErrorF("R_ALPHA_BRSGP bad alignment of offset\n");
}
symval = symval >> 2;
# ifdef ELFDEBUG
ELFDEBUG("symval=%lx\t", symval);
# endif
if (symval & 0xffe00000) {
# ifdef ELFDEBUG
ELFDEBUG("R_ALPHA_BRSGP symval too large\n");
# endif
}
*dest32 = (*dest32 & ~0x1fffff) | (symval & 0x1fffff);
# ifdef ELFDEBUG
ELFDEBUG("*dest32=%8.8x\n", *dest32);
# endif
break;
}
#endif /* alpha */ #endif /* alpha */
#if defined(__mc68000__) #if defined(__mc68000__)
case R_68K_32: case R_68K_32: