diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 033def0ff4a..8e9aaf93271 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-15  Doug Evans  <dje@google.com>
+
+	* dwarf2read.c (dw2_expand_symtabs_matching): Add some QUIT calls.
+
 2015-04-15  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* python/lib/gdb/command/unwinders.py: Add parentheses.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index f6b0c016232..b91fbf5d34f 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3875,6 +3875,8 @@ dw2_expand_symtabs_matching
 	  struct quick_file_names *file_data;
 	  void **slot;
 
+	  QUIT;
+
 	  per_cu->v.quick->mark = 0;
 
 	  /* We only need to look at symtabs not already expanded.  */
@@ -3935,6 +3937,8 @@ dw2_expand_symtabs_matching
       offset_type *vec, vec_len, vec_idx;
       int global_seen = 0;
 
+      QUIT;
+
       if (index->symbol_table[idx] == 0 && index->symbol_table[idx + 1] == 0)
 	continue;