about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/arm/dl-machine.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e1dc25c62e..9598180f8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-11-03  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
+	* sysdeps/arm/dl-machine.h (elf_machine_rel): Remove volatile.
+
+2017-11-03  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
 	[BZ #18572]
 	* sysdeps/arm/dl-machine.h (elf_machine_lazy_rel): Do symbol binding
 	non-lazily for R_ARM_TLS_DESC.
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index c59386f515..ec3a0274e3 100644
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -464,8 +464,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 	  }
 	case R_ARM_TLS_DESC:
 	  {
-	    struct tlsdesc volatile *td =
-	      (struct tlsdesc volatile *)reloc_addr;
+	    struct tlsdesc *td = (struct tlsdesc *)reloc_addr;
 
 # ifndef RTLD_BOOTSTRAP
 	    if (! sym)