diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d21e9e8eac..4140f2c336 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-02  Doug Evans  <dje@google.com>
+
+	* dwarf2read.c (add_partial_subprogram): Add missing baseaddr to
+	lowpc,highpc args to addrmap_set_empty.
+
 2010-03-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* amd64-tdep.c (amd64_byte_names): New.
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index a05c946c28..549d2c0add 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2695,7 +2695,8 @@ add_partial_subprogram (struct partial_die_info *pdi,
 	      baseaddr = ANOFFSET (objfile->section_offsets,
 				   SECT_OFF_TEXT (objfile));
 	      addrmap_set_empty (objfile->psymtabs_addrmap,
-				 pdi->lowpc, pdi->highpc - 1,
+				 pdi->lowpc + baseaddr,
+				 pdi->highpc - 1 + baseaddr,
 				 cu->per_cu->psymtab);
 	    }
           if (!pdi->is_declaration)