From b3d9c9a20c7e5cbee15b14990c4972d9df86dac7 Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Tue, 2 May 2017 16:55:48 -0300 Subject: [PATCH] sparc: handle R_SPARC_DISP64 and R_SPARC_REGISTER relocs The Studio compiler generates relocation types which are not supported in glibc. Handle these relocs. Tested in sparc64-linux-gnu. No regressions. BZ #21179] * sysdeps/sparc/sparc64/dl-machine.h: Handle R_SPARC_DISP64 and R_SPARC_REGISTER relocations. --- ChangeLog | 6 ++++++ sysdeps/sparc/sparc64/dl-machine.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 29a6592..4bd8578 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-05-02 Vladimir Mezentsev + + [BZ #21179] + * sysdeps/sparc/sparc64/dl-machine.h: Handle R_SPARC_DISP64 and + R_SPARC_REGISTER relocations. + 2017-05-02 Adhemerval Zanella * include/unistd.h (__pread): Add libc_hidden_proto. diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 99c00f4..1b59d78 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -537,6 +537,12 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, case R_SPARC_DISP32: *(unsigned int *) reloc_addr = (value - (Elf64_Addr) reloc_addr); break; + case R_SPARC_DISP64: + *reloc_addr = (value - (Elf64_Addr) reloc_addr); + break; + case R_SPARC_REGISTER: + *reloc_addr = value; + break; case R_SPARC_WDISP30: *(unsigned int *) reloc_addr = ((*(unsigned int *)reloc_addr & 0xc0000000) | -- 2.7.4