diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index f9d68627767e1c36ad34f07c207c7a0d9d01721f..f6fc888faf8da49fe11bbd5c24f29506cf2daf34 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-09  Ian Lance Taylor  <iant@google.com>
+
+	* dwarf.c (dwarf_fileline): Add cast to avoid warning.
+	(backtrace_dwarf_add): Likewise.
+
 2012-10-09  Ian Lance Taylor  <iant@google.com>
 
 	Add support for tracing through shared libraries.
diff --git a/libbacktrace/dwarf.c b/libbacktrace/dwarf.c
index 1b28a8f09b8a6229f14f7eef8054a706603e0fe3..b198dea38dc8ddfcda8b782a981dc31830491bc0 100644
--- a/libbacktrace/dwarf.c
+++ b/libbacktrace/dwarf.c
@@ -2763,7 +2763,7 @@ dwarf_fileline (struct backtrace_state *state, uintptr_t pc,
     {
       struct dwarf_data **pp;
 
-      pp = (struct dwarf_data **) &state->fileline_data;
+      pp = (struct dwarf_data **) (void *) &state->fileline_data;
       while (1)
 	{
 	  ddata = *pp;
@@ -2884,7 +2884,7 @@ backtrace_dwarf_add (struct backtrace_state *state,
     {
       struct dwarf_data **pp;
 
-      for (pp = (struct dwarf_data **) &state->fileline_data;
+      for (pp = (struct dwarf_data **) (void *) &state->fileline_data;
 	   *pp != NULL;
 	   pp = &(*pp)->next)
 	;
@@ -2896,7 +2896,7 @@ backtrace_dwarf_add (struct backtrace_state *state,
 	{
 	  struct dwarf_data **pp;
 
-	  pp = (struct dwarf_data **) &state->fileline_data;
+	  pp = (struct dwarf_data **) (void *) &state->fileline_data;
 
 	  while (1)
 	    {