75 lines
3.3 KiB
Diff
75 lines
3.3 KiB
Diff
From 5756a6d385cfb451b752c6a77252f2befd43493f Mon Sep 17 00:00:00 2001
|
|
From: Fedora GDB patches <invalid@email.com>
|
|
Date: Fri, 27 Oct 2017 21:07:50 +0200
|
|
Subject: gdb-archer-pie-addons.patch
|
|
|
|
FileName: gdb-archer-pie-addons.patch
|
|
|
|
;;=push+jan: May get obsoleted by Tom's unrelocated objfiles patch.
|
|
---
|
|
gdb/gdbtypes.h | 5 +++++
|
|
gdb/value.c | 3 ++-
|
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
|
|
index e26a09b456..d92ffc228b 100644
|
|
--- a/gdb/gdbtypes.h
|
|
+++ b/gdb/gdbtypes.h
|
|
@@ -440,6 +440,7 @@ enum field_loc_kind
|
|
{
|
|
FIELD_LOC_KIND_BITPOS, /**< bitpos */
|
|
FIELD_LOC_KIND_ENUMVAL, /**< enumval */
|
|
+ /* 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 */
|
|
@@ -491,6 +492,7 @@ union field_location
|
|
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;
|
|
|
|
@@ -1332,6 +1334,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
|
|
#define FIELD_ENUMVAL_LVAL(thisfld) ((thisfld).loc.enumval)
|
|
#define FIELD_ENUMVAL(thisfld) (FIELD_ENUMVAL_LVAL (thisfld) + 0)
|
|
#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) \
|
|
@@ -1343,6 +1346,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
|
|
#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))
|
|
@@ -1359,6 +1363,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
|
|
#define TYPE_FIELD_BITPOS(thistype, n) FIELD_BITPOS (TYPE_FIELD (thistype, n))
|
|
#define TYPE_FIELD_ENUMVAL(thistype, n) FIELD_ENUMVAL (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))
|
|
diff --git a/gdb/value.c b/gdb/value.c
|
|
index 3e0ca25fa7..a61f728550 100644
|
|
--- a/gdb/value.c
|
|
+++ b/gdb/value.c
|
|
@@ -2966,7 +2966,8 @@ value_static_field (struct type *type, int fieldno)
|
|
{
|
|
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:
|
|
{
|
|
--
|
|
2.14.3
|
|
|