diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index f6fc888faf8..ecb51dfd17d 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-10  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* elf.c (elf_add_syminfo_data): Add casts to avoid warning.
+
 2012-10-09  Ian Lance Taylor  <iant@google.com>
 
 	* dwarf.c (dwarf_fileline): Add cast to avoid warning.
diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c
index 48e88849813..518e125a101 100644
--- a/libbacktrace/elf.c
+++ b/libbacktrace/elf.c
@@ -410,7 +410,7 @@ elf_add_syminfo_data (struct backtrace_state *state,
     {
       struct elf_syminfo_data **pp;
 
-      for (pp = (struct elf_syminfo_data **) &state->syminfo_data;
+      for (pp = (struct elf_syminfo_data **) (void *) &state->syminfo_data;
 	   *pp != NULL;
 	   pp = &(*pp)->next)
 	;
@@ -422,7 +422,7 @@ elf_add_syminfo_data (struct backtrace_state *state,
 	{
 	  struct elf_syminfo_data **pp;
 
-	  pp = (struct elf_syminfo_data **) &state->syminfo_data;
+	  pp = (struct elf_syminfo_data **) (void *) &state->syminfo_data;
 
 	  while (1)
 	    {