diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a28fdad66c2..0d2e7f39234 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-19  Pedro Alves  <palves@redhat.com>
+
+	* dwarf2read.c (dwarf2_get_dwz_file): Add cast to const char *.
+	(read_index_from_section): Add cast to 'char *'.
+
 2013-04-19  Pedro Alves  <palves@redhat.com>
 
 	* xcoffread.c (xcoff_initial_scan): Add cast to 'char *'.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 8490eb97e26..5a1af02c2ac 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2103,7 +2103,7 @@ dwarf2_get_dwz_file (void)
 	   bfd_errmsg (bfd_get_error ()));
   cleanup = make_cleanup (xfree, data);
 
-  filename = data;
+  filename = (const char *) data;
   if (!IS_ABSOLUTE_PATH (filename))
     {
       char *abs = gdb_realpath (dwarf2_per_objfile->objfile->name);
@@ -2764,7 +2764,7 @@ to use the section anyway."),
 			     / (2 * sizeof (offset_type)));
   ++i;
 
-  map->constant_pool = addr + MAYBE_SWAP (metadata[i]);
+  map->constant_pool = (char *) (addr + MAYBE_SWAP (metadata[i]));
 
   return 1;
 }