From caca5647414a2506b084ea0fb1fa067d212c9fa0 Mon Sep 17 00:00:00 2001 From: Fedora GDB patches Date: Fri, 27 Oct 2017 21:07:50 +0200 Subject: gdb-archer-pie-addons-keep-disabled.patch FileName: gdb-archer-pie-addons-keep-disabled.patch ;;=push+jan: Breakpoints disabling matching should not be based on address. --- gdb/breakpoint.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ gdb/breakpoint.h | 3 +++ gdb/objfiles.c | 5 +++++ 3 files changed, 52 insertions(+) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index d4d095d87e..bc0134db36 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -15607,6 +15607,50 @@ initialize_breakpoint_ops (void) static struct cmd_list_element *enablebreaklist = NULL; +void +breakpoints_relocate (struct objfile *objfile, struct section_offsets *delta) +{ + struct bp_location *bl, **blp_tmp; + int changed = 0; + + gdb_assert (objfile->separate_debug_objfile_backlink == NULL); + + ALL_BP_LOCATIONS (bl, blp_tmp) + { + struct obj_section *osect; + + /* BL->SECTION can be correctly NULL for breakpoints with multiple + locations expanded through symtab. */ + + ALL_OBJFILE_OSECTIONS (objfile, osect) + { + CORE_ADDR relocated_address; + CORE_ADDR delta_offset; + + delta_offset = ANOFFSET (delta, osect->the_bfd_section->index); + if (delta_offset == 0) + continue; + relocated_address = bl->address + delta_offset; + + if (obj_section_addr (osect) <= relocated_address + && relocated_address < obj_section_endaddr (osect)) + { + if (bl->inserted) + remove_breakpoint (bl); + + bl->address += delta_offset; + bl->requested_address += delta_offset; + + changed = 1; + } + } + } + + if (changed) + qsort (bp_locations, bp_locations_count, sizeof (*bp_locations), + bp_locations_compare); +} + void _initialize_breakpoint (void) { diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 6406a1d32b..eed2c968f2 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -1656,6 +1656,9 @@ extern const char *ep_parse_optional_if_clause (const char **arg); UIOUT iff debugging multiple threads. */ extern void maybe_print_thread_hit_breakpoint (struct ui_out *uiout); +extern void breakpoints_relocate (struct objfile *objfile, + struct section_offsets *delta); + /* Print the specified breakpoint. */ extern void print_breakpoint (breakpoint *bp); diff --git a/gdb/objfiles.c b/gdb/objfiles.c index edde399802..1d24fa95ba 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -879,6 +879,11 @@ objfile_relocate1 (struct objfile *objfile, obj_section_addr (s)); } + /* Final call of breakpoint_re_set can keep breakpoint locations disabled if + their addresses match. */ + if (objfile->separate_debug_objfile_backlink == NULL) + breakpoints_relocate (objfile, delta); + /* Data changed. */ return 1; } -- 2.14.3