sparc: elf: handle R_SPARC_DISP64 and R_SPARC_REGISTER relocs

Message ID e5876f35-0629-19cc-88d0-7de71a6b4b3e@oracle.com
State New, archived
Headers

Commit Message

Vladimir Mezentsev Feb. 17, 2017, 5:26 p.m. UTC
  From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>

     The Studio compiler generates relocation types which are not supported
     in glibc. Handle these relocs.

     Tested in sparc64-linux-gnu. No regressions.

	* sysdeps/sparc/sparc64/dl-machine.h: Handle R_SPARC_DISP64 and
	R_SPARC_REGISTER relocations.
---
  sysdeps/sparc/sparc64/dl-machine.h |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)
  

Comments

David Miller Feb. 17, 2017, 7:48 p.m. UTC | #1
From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
Date: Fri, 17 Feb 2017 09:26:42 -0800

> From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
> 
>     The Studio compiler generates relocation types which are not supported
>     in glibc. Handle these relocs.
> 
>     Tested in sparc64-linux-gnu. No regressions.
> 
> 	* sysdeps/sparc/sparc64/dl-machine.h: Handle R_SPARC_DISP64 and
> 	R_SPARC_REGISTER relocations.

This is fine.
  
Joseph Myers Feb. 17, 2017, 9:07 p.m. UTC | #2
On Fri, 17 Feb 2017, Vladimir Mezentsev wrote:

> From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
> 
>     The Studio compiler generates relocation types which are not supported
>     in glibc. Handle these relocs.
> 
>     Tested in sparc64-linux-gnu. No regressions.
> 
> 	* sysdeps/sparc/sparc64/dl-machine.h: Handle R_SPARC_DISP64 and
> 	R_SPARC_REGISTER relocations.

Since you filed bug 21179 for this, you need to include [BZ #21179] in the 
ChangeLog entry.
  

Patch

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) |