diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d658bfb2f9..edfeec934f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-18  Joel Brobecker  <brobecker@adacore.com>
+
+	* dwarf2read.c (dwarf2_per_objfile): Replace uses of
+	DWARF2_PER_OBJFILE by uses of DATA instead.
+
 2013-06-18  Tom Tromey  <tromey@redhat.com>
 
 	* break-catch-sig.c (signal_catchpoint_explains_signal): Add 'sig'
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 316bb861c0..0cb9568a96 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -20491,14 +20491,13 @@ dwarf2_per_objfile_free (struct objfile *objfile, void *d)
   struct dwarf2_per_objfile *data = d;
   int ix;
 
-  for (ix = 0; ix < dwarf2_per_objfile->n_comp_units; ++ix)
-    VEC_free (dwarf2_per_cu_ptr,
-	      dwarf2_per_objfile->all_comp_units[ix]->imported_symtabs);
+  for (ix = 0; ix < data->n_comp_units; ++ix)
+   VEC_free (dwarf2_per_cu_ptr, data->all_comp_units[ix]->imported_symtabs);
 
-  for (ix = 0; ix < dwarf2_per_objfile->n_type_units; ++ix)
+  for (ix = 0; ix < data->n_type_units; ++ix)
     VEC_free (dwarf2_per_cu_ptr,
-	      dwarf2_per_objfile->all_type_units[ix]->per_cu.imported_symtabs);
-  xfree (dwarf2_per_objfile->all_type_units);
+	      data->all_type_units[ix]->per_cu.imported_symtabs);
+  xfree (data->all_type_units);
 
   VEC_free (dwarf2_section_info_def, data->types);