[PATCH][gdb] Fix gdb.dwarf2/varval.exp with -fPIE/-pie

Tom de Vries tdevries@suse.de
Thu Aug 8 12:49:00 GMT 2019


Hi,

With target board unix/-fPIE/-pie, we get:
...
FAIL: gdb.dwarf2/varval.exp: print varval2
...

This is due comparing a get_frame_pc result (which includes the for PIE
non-zero relocation offset) with pc_high and pc_low obtained using
get_scope_pc_bounds (which do not include the relocation offset).

Fix this by adjusting pc_high and pc_low with the relocation offset.

Tested on x86_64-linux with target board unix/-fPIE/-pie.

OK for trunk?

Thanks,
- Tom

[gdb] Fix gdb.dwarf2/varval.exp with -fPIE/-pie

gdb/ChangeLog:

2019-08-08  Tom de Vries  <tdevries@suse.de>

	PR gdb/24591
	* dwarf2read.c (dwarf2_fetch_die_loc_sect_off): Adjust pc_high and
	pc_low with relocation offset.

---
 gdb/dwarf2read.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 1c26f8355f..fde08047ca 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -23206,6 +23206,9 @@ dwarf2_fetch_die_loc_sect_off (sect_offset sect_off,
 	  != dwarf2_per_objfile->abstract_to_concrete.end ()))
     {
       CORE_ADDR pc = (*get_frame_pc) (baton);
+      CORE_ADDR baseaddr
+	= ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+      struct gdbarch *gdbarch = get_objfile_arch (objfile);
 
       for (const auto &cand_off
 	     : dwarf2_per_objfile->abstract_to_concrete[die->sect_off])
@@ -23220,6 +23223,8 @@ dwarf2_fetch_die_loc_sect_off (sect_offset sect_off,
 
 	  CORE_ADDR pc_low, pc_high;
 	  get_scope_pc_bounds (cand->parent, &pc_low, &pc_high, cu);
+	  pc_low = gdbarch_adjust_dwarf2_addr (gdbarch, pc_low + baseaddr);
+	  pc_high = gdbarch_adjust_dwarf2_addr (gdbarch, pc_high + baseaddr);
 	  if (pc_low == ((CORE_ADDR) -1)
 	      || !(pc_low <= pc && pc < pc_high))
 	    continue;



More information about the Gdb-patches mailing list