OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct little-endian relocation of UADDR64,32,16. 

* sysdeps/powerpc/powerpc32/dl-machine.c (__process_machine_rela):
	Correct handling of unaligned relocs for little-endian.
	* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela): Likewise.
This commit is contained in:
Alan Modra 2013-10-03 13:51:52 +09:30
parent f5a0a42a03
commit f8e3e9f31b
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-10-04 Alan Modra <amodra@gmail.com>
* sysdeps/powerpc/powerpc32/dl-machine.c (__process_machine_rela):
Correct handling of unaligned relocs for little-endian.
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela): Likewise.
2013-10-04 Alan Modra <amodra@gmail.com>
* configure.in: Map powerpc64le and powerpcle to base_machine/machine.

14
sysdeps/powerpc/powerpc32/dl-machine.c
View File

@ -416,6 +416,12 @@ __process_machine_rela (struct link_map *map,
Elf32_Addr const finaladdr,
int rinfo)
{
union unaligned
{
unsigned u2 __attribute__ ((mode (HI)));
unsigned u4 __attribute__ ((mode (SI)));
} __attribute__((__packed__));
switch (rinfo)
{
case R_PPC_NONE:
@ -432,10 +438,7 @@ __process_machine_rela (struct link_map *map,
return;
case R_PPC_UADDR32:
((char *) reloc_addr)[0] = finaladdr >> 24;
((char *) reloc_addr)[1] = finaladdr >> 16;
((char *) reloc_addr)[2] = finaladdr >> 8;
((char *) reloc_addr)[3] = finaladdr;
((union unaligned *) reloc_addr)->u4 = finaladdr;
break;
case R_PPC_ADDR24:
@ -453,8 +456,7 @@ __process_machine_rela (struct link_map *map,
case R_PPC_UADDR16:
if (__builtin_expect (finaladdr > 0x7fff && finaladdr < 0xffff8000, 0))
_dl_reloc_overflow (map, "R_PPC_UADDR16", reloc_addr, refsym);
((char *) reloc_addr)[0] = finaladdr >> 8;
((char *) reloc_addr)[1] = finaladdr;
((union unaligned *) reloc_addr)->u2 = finaladdr;
break;
case R_PPC_ADDR16_LO:

28
sysdeps/powerpc/powerpc64/dl-machine.h
View File

@ -561,6 +561,12 @@ elf_machine_rela (struct link_map *map,
Elf64_Addr *const reloc_addr = reloc_addr_arg;
const int r_type = ELF64_R_TYPE (reloc->r_info);
const Elf64_Sym *const refsym = sym;
union unaligned
{
unsigned u2 __attribute__ ((mode (HI)));
unsigned u4 __attribute__ ((mode (SI)));
unsigned u8 __attribute__ ((mode (DI)));
} __attribute__((__packed__));
if (r_type == R_PPC64_RELATIVE)
{
@ -741,23 +747,11 @@ elf_machine_rela (struct link_map *map,
return;
case R_PPC64_UADDR64:
/* We are big-endian. */
((char *) reloc_addr_arg)[0] = (value >> 56) & 0xff;
((char *) reloc_addr_arg)[1] = (value >> 48) & 0xff;
((char *) reloc_addr_arg)[2] = (value >> 40) & 0xff;
((char *) reloc_addr_arg)[3] = (value >> 32) & 0xff;
((char *) reloc_addr_arg)[4] = (value >> 24) & 0xff;
((char *) reloc_addr_arg)[5] = (value >> 16) & 0xff;
((char *) reloc_addr_arg)[6] = (value >> 8) & 0xff;
((char *) reloc_addr_arg)[7] = (value >> 0) & 0xff;
((union unaligned *) reloc_addr)->u8 = value;
return;
case R_PPC64_UADDR32:
/* We are big-endian. */
((char *) reloc_addr_arg)[0] = (value >> 24) & 0xff;
((char *) reloc_addr_arg)[1] = (value >> 16) & 0xff;
((char *) reloc_addr_arg)[2] = (value >> 8) & 0xff;
((char *) reloc_addr_arg)[3] = (value >> 0) & 0xff;
((union unaligned *) reloc_addr)->u4 = value;
return;
case R_PPC64_ADDR32:
@ -781,10 +775,8 @@ elf_machine_rela (struct link_map *map,
case R_PPC64_UADDR16:
if (dont_expect ((value + 0x8000) >= 0x10000))
_dl_reloc_overflow (map, "R_PPC64_UADDR16", reloc_addr, refsym);
/* We are big-endian. */
((char *) reloc_addr_arg)[0] = (value >> 8) & 0xff;
((char *) reloc_addr_arg)[1] = (value >> 0) & 0xff;
break;
((union unaligned *) reloc_addr)->u2 = value;
return;
case R_PPC64_ADDR16_DS:
if (dont_expect ((value + 0x8000) >= 0x10000 || (value & 3) != 0))