[BZ,#21179] - handle R_SPARC_DISP64 and R_SPARC_REGISTER relocs

Message ID 58AB538F.6020106@oracle.com
State New, archived
Headers

Commit Message

Vladimir Mezentsev Feb. 20, 2017, 8:37 p.m. UTC
  On 02/17/2017 01:07 PM, Joseph Myers wrote:
> 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.

  Done.

Can somebody apply my fixes. I don't have write access to the repo.
Thank you.
-Vladimir



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.

	[BZ #21179]
	* 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

Adhemerval Zanella Netto May 2, 2017, 7:57 p.m. UTC | #1
On 20/02/2017 17:37, Vladimir Mezentsev wrote:
> On 02/17/2017 01:07 PM, Joseph Myers wrote:
>> 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.
> 
>  Done.
> 
> Can somebody apply my fixes. I don't have write access to the repo.
> Thank you.
> -Vladimir
> 
> 
> 
> 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.
> 
>     [BZ #21179]
>     * 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(-)
> 
> 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) |

Done.
  

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