diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2d9963d146..31745c6db7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-15  Tom Tromey  <tromey@redhat.com>
+
+	* dwarf2read.c (die_needs_namespace): Also return 0 for
+	DW_TAG_subprogram.
+
 2010-03-15  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	PR c++/7936:
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index db3f39614e..563cb185de 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3241,7 +3241,8 @@ die_needs_namespace (struct die_info *die, struct dwarf2_cu *cu)
 	 and have a mangled name.  */
       if (die->parent->tag ==  DW_TAG_lexical_block
 	  || die->parent->tag ==  DW_TAG_try_block
-	  || die->parent->tag ==  DW_TAG_catch_block)
+	  || die->parent->tag ==  DW_TAG_catch_block
+	  || die->parent->tag == DW_TAG_subprogram)
 	return 0;
       return 1;