2004-05-13 Bryce McKinlay <mckinlay@redhat.com>

	* dwarf2loc.c (find_location_expression): Use ANOFFSET to adjust
	base_address for shared libraries.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 013c3ed116a95da091bcdef98eb5e5e50831e3b4..d6f6a4603af3cdf890bb853997e6748e89aa2a9f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13  Bryce McKinlay  <mckinlay@redhat.com>
+
+       * dwarf2loc.c (find_location_expression): Use ANOFFSET to adjust
+       base_address for shared libraries.
+
 2004-05-11  Nick Roberts  <nickrob@gnu.org>
 
        * utils.c (defaulted_query): Just use the normal query input type

diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index ef333f7e77012d4c08ef1a1ce0f16031dacacdf0..cdbeb10acf43eef6557822c49be23169406e1a54 100644 (file)
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -53,11 +53,14 @@ static char *
 find_location_expression (struct dwarf2_loclist_baton *baton,
                          size_t *locexpr_length, CORE_ADDR pc)
 {
-  CORE_ADDR base_address = baton->base_address;
   CORE_ADDR low, high;
   char *loc_ptr, *buf_end;
   unsigned int addr_size = TARGET_ADDR_BIT / TARGET_CHAR_BIT, length;
   CORE_ADDR base_mask = ~(~(CORE_ADDR)1 << (addr_size * 8 - 1));
+  /* Adjust base_address for relocatable objects.  */
+  CORE_ADDR base_offset = ANOFFSET (baton->objfile->section_offsets,
+                                   SECT_OFF_TEXT (baton->objfile));
+  CORE_ADDR base_address = baton->base_address + base_offset;
 
   loc_ptr = baton->data;
   buf_end = baton->data + baton->size;