diff --git a/ChangeLog b/ChangeLog
index 29a6592373..4bd8578fc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-02  Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
+
+	[BZ #21179]
+	* sysdeps/sparc/sparc64/dl-machine.h: Handle R_SPARC_DISP64 and
+	R_SPARC_REGISTER relocations.
+
 2017-05-02  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* 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 99c00f493d..1b59d78a25 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) |