32f92b2
Index: gdb-7.9.50.20150520/gdb/gdbtypes.h
8c4c91e
===================================================================
32f92b2
--- gdb-7.9.50.20150520.orig/gdb/gdbtypes.h	2015-05-31 16:55:29.723475485 +0200
32f92b2
+++ gdb-7.9.50.20150520/gdb/gdbtypes.h	2015-05-31 16:55:49.716601669 +0200
32f92b2
@@ -462,6 +462,7 @@ enum field_loc_kind
8c4c91e
   {
eb6cb2d
     FIELD_LOC_KIND_BITPOS,	/**< bitpos */
eb6cb2d
     FIELD_LOC_KIND_ENUMVAL,	/**< enumval */
8c4c91e
+    /* This address is unrelocated by the objfile's ANOFFSET.  */
eb6cb2d
     FIELD_LOC_KIND_PHYSADDR,	/**< physaddr */
eb6cb2d
     FIELD_LOC_KIND_PHYSNAME,	/**< physname */
eb6cb2d
     FIELD_LOC_KIND_DWARF_BLOCK	/**< dwarf_block */
32f92b2
@@ -513,6 +514,7 @@ union field_location
32f92b2
      field.  Otherwise, physname is the mangled label of the
32f92b2
      static field.  */
8c4c91e
 
32f92b2
+  /* This address is unrelocated by the objfile's ANOFFSET.  */
32f92b2
   CORE_ADDR physaddr;
32f92b2
   const char *physname;
254f0e9
 
32f92b2
@@ -1386,6 +1388,7 @@ extern void set_type_vptr_basetype (stru
f8eee05
 #define FIELD_ENUMVAL_LVAL(thisfld) ((thisfld).loc.enumval)
f8eee05
 #define FIELD_ENUMVAL(thisfld) (FIELD_ENUMVAL_LVAL (thisfld) + 0)
0911f37
 #define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc.physname)
0911f37
+/* This address is unrelocated by the objfile's ANOFFSET.  */
0911f37
 #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc.physaddr)
254f0e9
 #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc.dwarf_block)
0911f37
 #define SET_FIELD_BITPOS(thisfld, bitpos)			\
32f92b2
@@ -1397,6 +1400,7 @@ extern void set_type_vptr_basetype (stru
0911f37
 #define SET_FIELD_PHYSNAME(thisfld, name)			\
0911f37
   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSNAME,		\
0911f37
    FIELD_STATIC_PHYSNAME (thisfld) = (name))
0911f37
+/* This address is unrelocated by the objfile's ANOFFSET.  */
0911f37
 #define SET_FIELD_PHYSADDR(thisfld, addr)			\
0911f37
   (FIELD_LOC_KIND (thisfld) = FIELD_LOC_KIND_PHYSADDR,		\
0911f37
    FIELD_STATIC_PHYSADDR (thisfld) = (addr))
32f92b2
@@ -1413,6 +1417,7 @@ extern void set_type_vptr_basetype (stru
0911f37
 #define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))
f8eee05
 #define TYPE_FIELD_ENUMVAL(thistype, n) FIELD_ENUMVAL (TYPE_FIELD (thistype, n))
0911f37
 #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME (TYPE_FIELD (thistype, n))
0911f37
+/* This address is unrelocated by the objfile's ANOFFSET.  */
0911f37
 #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) FIELD_STATIC_PHYSADDR (TYPE_FIELD (thistype, n))
254f0e9
 #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n))
0911f37
 #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n))
32f92b2
Index: gdb-7.9.50.20150520/gdb/jv-lang.c
8c4c91e
===================================================================
32f92b2
--- gdb-7.9.50.20150520.orig/gdb/jv-lang.c	2015-05-31 16:55:29.724475491 +0200
32f92b2
+++ gdb-7.9.50.20150520/gdb/jv-lang.c	2015-05-31 16:55:30.820482408 +0200
eb6cb2d
@@ -427,7 +427,8 @@ java_link_class_type (struct gdbarch *gd
0911f37
 
0911f37
   fields = NULL;
b0e03f5
   nfields--;			/* First set up dummy "class" field.  */
0911f37
-  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas));
0911f37
+  SET_FIELD_PHYSADDR (TYPE_FIELD (type, nfields), value_address (clas)
0911f37
+    - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
0911f37
   TYPE_FIELD_NAME (type, nfields) = "class";
0911f37
   TYPE_FIELD_TYPE (type, nfields) = value_type (clas);
0911f37
   SET_TYPE_FIELD_PRIVATE (type, nfields);
eb6cb2d
@@ -475,7 +476,8 @@ java_link_class_type (struct gdbarch *gd
0911f37
 	  SET_TYPE_FIELD_PROTECTED (type, i);
0911f37
 	}
0911f37
       if (accflags & 0x0008)	/* ACC_STATIC */
0911f37
-	SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset);
0911f37
+	SET_FIELD_PHYSADDR (TYPE_FIELD (type, i), boffset
0911f37
+	  - (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
0911f37
       else
f8eee05
 	SET_FIELD_BITPOS (TYPE_FIELD (type, i), 8 * boffset);
0911f37
       if (accflags & 0x8000)	/* FIELD_UNRESOLVED_FLAG */
32f92b2
Index: gdb-7.9.50.20150520/gdb/value.c
8c4c91e
===================================================================
32f92b2
--- gdb-7.9.50.20150520.orig/gdb/value.c	2015-05-31 16:55:29.725475497 +0200
32f92b2
+++ gdb-7.9.50.20150520/gdb/value.c	2015-05-31 16:55:30.821482415 +0200
32f92b2
@@ -2951,7 +2951,8 @@ value_static_field (struct type *type, i
0911f37
     {
dd46ae6
     case FIELD_LOC_KIND_PHYSADDR:
dd46ae6
       retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno),
dd46ae6
-			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno));
dd46ae6
+			      TYPE_FIELD_STATIC_PHYSADDR (type, fieldno)
dd46ae6
+			      + (TYPE_OBJFILE (type) == NULL ? 0 : ANOFFSET (TYPE_OBJFILE (type)->section_offsets, SECT_OFF_TEXT (TYPE_OBJFILE (type)))));
dd46ae6
       break;
dd46ae6
     case FIELD_LOC_KIND_PHYSNAME:
0911f37
     {