From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat, 9 Apr 2011 15:20:38 +0000 (+0000)
Subject: gdb/
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4f2f049b185f79cd2319351e78c8b9c8f97c0f0;p=binutils-gdb.git

gdb/
	Fix crash of gdb save-index on a STABS file.
	* dwarf2read.c (write_psymtabs_to_index): Return also on no
	PSYMTABS_ADDRMAP.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 038c56b8a0e..7da8c9e892d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Fix crash of gdb save-index on a STABS file.
+	* dwarf2read.c (write_psymtabs_to_index): Return also on no
+	PSYMTABS_ADDRMAP.
+
 2011-04-09  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Fix DW_AT_accessibility compatibility with gcc-4.6+.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 15311feca12..5bf98deb916 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -15843,8 +15843,9 @@ write_psymtabs_to_index (struct objfile *objfile, const char *dir)
   htab_t cu_index_htab;
   struct psymtab_cu_index_map *psymtab_cu_index_map;
 
-  if (!objfile->psymtabs)
+  if (!objfile->psymtabs || !objfile->psymtabs_addrmap)
     return;
+
   if (dwarf2_per_objfile->using_index)
     error (_("Cannot use an index to create the index"));