Index: gdb-7.4.50.20111218/gdb/dwarf2read.c

===================================================================

--- gdb-7.4.50.20111218.orig/gdb/dwarf2read.c	2011-12-19 01:31:24.000000000 +0100

+++ gdb-7.4.50.20111218/gdb/dwarf2read.c	2011-12-19 01:33:25.263238972 +0100

@@ -8347,7 +8347,12 @@ read_common_block (struct die_info *die,

 {

   struct attribute *attr;

   struct symbol *sym;

-  CORE_ADDR base = (CORE_ADDR) 0;

+  struct objfile *objfile = cu->objfile;

+  CORE_ADDR baseaddr = ANOFFSET (objfile->section_offsets,

+				 SECT_OFF_TEXT (objfile));

+  /* This is used only for DW_AT_data_member_location entries.  */

+  CORE_ADDR base = 0;

+  int base_p = 0;

   attr = dwarf2_attr (die, DW_AT_location, cu);

   if (attr)

@@ -8356,6 +8361,7 @@ read_common_block (struct die_info *die,

       if (attr_form_is_block (attr))

         {

           base = decode_locdesc (DW_BLOCK (attr), cu);

+	  base_p = 1;

         }

       else if (attr_form_is_section_offset (attr))

         {

@@ -8408,12 +8414,15 @@ read_common_block (struct die_info *die,

 	  if (sym != NULL

 	      && handle_data_member_location (child_die, cu, &offset))

 	    {

-	      SYMBOL_VALUE_ADDRESS (sym) = base + offset;

+	      if (!base_p)

+		dwarf2_invalid_attrib_class_complaint

+		  ("DW_AT_data_member_location", "common block member");

+	      SYMBOL_VALUE_ADDRESS (sym) = base + offset + baseaddr;

 	      add_symbol_to_list (sym, &global_symbols);

 	    }

 	  if (SYMBOL_CLASS (sym) == LOC_STATIC)

-	    SET_FIELD_PHYSADDR (*field, SYMBOL_VALUE_ADDRESS (sym));

+	    SET_FIELD_PHYSADDR (*field, SYMBOL_VALUE_ADDRESS (sym) - baseaddr);

 	  else

 	    SET_FIELD_PHYSNAME (*field, SYMBOL_LINKAGE_NAME (sym));

 	  FIELD_TYPE (*field) = SYMBOL_TYPE (sym);

@@ -8427,7 +8436,7 @@ read_common_block (struct die_info *die,

       sym = new_symbol (die, type, cu);

       /* SYMBOL_VALUE_ADDRESS never gets used as all its fields are static.  */

-      SYMBOL_VALUE_ADDRESS (sym) = base;

+      SYMBOL_VALUE_ADDRESS (sym) = base + baseaddr;

       set_die_type (die, type, cu);

     }

Index: gdb-7.4.50.20111218/gdb/gdbtypes.h

===================================================================

--- gdb-7.4.50.20111218.orig/gdb/gdbtypes.h	2011-12-18 23:35:23.000000000 +0100

+++ gdb-7.4.50.20111218/gdb/gdbtypes.h	2011-12-19 01:34:21.448025620 +0100

@@ -396,6 +396,7 @@ enum type_instance_flag_value

 enum field_loc_kind

   {

     FIELD_LOC_KIND_BITPOS,	/* bitpos */

+    /* This address is unrelocated by the objfile's ANOFFSET.  */

     FIELD_LOC_KIND_PHYSADDR,	/* physaddr */

     FIELD_LOC_KIND_PHYSNAME,	/* physname */

     FIELD_LOC_KIND_DWARF_BLOCK	/* dwarf_block */

@@ -581,6 +582,7 @@ struct main_type

 	   is the location (in the target) of the static field.

 	   Otherwise, physname is the mangled label of the static field.  */

+	/* This address is unrelocated by the objfile's ANOFFSET.  */

 	CORE_ADDR physaddr;

 	const char *physname;

@@ -1194,6 +1196,7 @@ extern void allocate_gnat_aux_type (stru

 #define FIELD_LOC_KIND(thisfld) ((thisfld).loc_kind)

 #define FIELD_BITPOS(thisfld) ((thisfld).loc.bitpos)

 #define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname)

+/* This address is unrelocated by the objfile's ANOFFSET.  */

 #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr)

 #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block)

 #define SET_FIELD_BITPOS(thisfld, bitpos)			\

@@ -1202,6 +1205,7 @@ extern void allocate_gnat_aux_type (stru

 #define SET_FIELD_PHYSNAME(thisfld, name)			\

   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME,		\

    FIELD_STATIC_PHYSNAME (thisfld) = (name))

+/* This address is unrelocated by the objfile's ANOFFSET.  */

 #define SET_FIELD_PHYSADDR(thisfld, addr)			\

   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR,		\

    FIELD_STATIC_PHYSADDR (thisfld) = (addr))

@@ -1217,6 +1221,7 @@ extern void allocate_gnat_aux_type (stru

 #define TYPE_FIELD_LOC_KIND(thistype, n) FIELD_LOC_KIND (TYPE_FIELD (thistype, n))

 #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))

 #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n))

+/* This address is unrelocated by the objfile's ANOFFSET.  */

 #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) FIELD_STATIC_PHYSADDR (TYPE_FIELD (thistype, n))

 #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n))

 #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n))

Index: gdb-7.4.50.20111218/gdb/jv-lang.c

===================================================================

--- gdb-7.4.50.20111218.orig/gdb/jv-lang.c	2011-12-06 19:54:39.000000000 +0100

+++ gdb-7.4.50.20111218/gdb/jv-lang.c	2011-12-19 01:33:25.280238908 +0100

@@ -430,7 +430,8 @@ java_link_class_type (struct gdbarch *gd

   fields = NULL;

   nfields--;			/* First set up dummy "class" field.  */

-  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas));

+  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas)

+    - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));

   TYPE_FIELD_NAME (type, nfields) = "class";

   TYPE_FIELD_TYPE (type, nfields) = value_type (clas);

   SET_TYPE_FIELD_PRIVATE (type, nfields);

@@ -478,7 +479,8 @@ java_link_class_type (struct gdbarch *gd

 	  SET_TYPE_FIELD_PROTECTED (type, i);

 	}

       if (accflags & 0x0008)	/* ACC_STATIC */

-	SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset);

+	SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset

+	  - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));

       else

 	TYPE_FIELD_BITPOS (type, i) = 8 * boffset;

       if (accflags & 0x8000)	/* FIELD_UNRESOLVED_FLAG */

Index: gdb-7.4.50.20111218/gdb/value.c

===================================================================

--- gdb-7.4.50.20111218.orig/gdb/value.c	2011-12-18 23:35:23.000000000 +0100

+++ gdb-7.4.50.20111218/gdb/value.c	2011-12-19 01:33:25.283238896 +0100

@@ -2481,7 +2481,8 @@ value_static_field (struct type *type, i

     {

     case FIELD_LOC_KIND_PHYSADDR:

       retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno),

-			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno));

+			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)

+			      + (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));

       break;

     case FIELD_LOC_KIND_PHYSNAME:

     {