f8eee05550
- [testsuite] BuildRequire gcc-go. - Drop printing 2D C++ vectors as matrices which no longer worked (BZ 562763). - Fix dejagnu-1.5-4.fc17 compatibility for Go (for BZ 635651). - Use librpm.so.3 for rpm-4.10.0 in Fedora 18. - Revert recent breakage of UNIX objfiles order for symbols lookup.
84 lines
2.7 KiB
Diff
84 lines
2.7 KiB
Diff
Index: gdb-7.4.50.20120602/gdb/breakpoint.c
|
|
===================================================================
|
|
--- gdb-7.4.50.20120602.orig/gdb/breakpoint.c 2012-06-02 19:11:54.000000000 +0200
|
|
+++ gdb-7.4.50.20120602/gdb/breakpoint.c 2012-06-02 19:52:58.161226506 +0200
|
|
@@ -15495,6 +15495,50 @@ initialize_breakpoint_ops (void)
|
|
}
|
|
|
|
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, mark_uninserted);
|
|
+
|
|
+ bl->address += delta_offset;
|
|
+ bl->requested_address += delta_offset;
|
|
+
|
|
+ changed = 1;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (changed)
|
|
+ qsort (bp_location, bp_location_count, sizeof (*bp_location),
|
|
+ bp_location_compare);
|
|
+}
|
|
+
|
|
+void
|
|
_initialize_breakpoint (void)
|
|
{
|
|
struct cmd_list_element *c;
|
|
Index: gdb-7.4.50.20120602/gdb/breakpoint.h
|
|
===================================================================
|
|
--- gdb-7.4.50.20120602.orig/gdb/breakpoint.h 2012-05-16 16:35:03.000000000 +0200
|
|
+++ gdb-7.4.50.20120602/gdb/breakpoint.h 2012-06-02 19:53:09.268223263 +0200
|
|
@@ -1503,4 +1503,7 @@ extern struct gdbarch *get_sal_arch (str
|
|
|
|
extern void handle_solib_event (void);
|
|
|
|
+extern void breakpoints_relocate (struct objfile *objfile,
|
|
+ struct section_offsets *delta);
|
|
+
|
|
#endif /* !defined (BREAKPOINT_H) */
|
|
Index: gdb-7.4.50.20120602/gdb/objfiles.c
|
|
===================================================================
|
|
--- gdb-7.4.50.20120602.orig/gdb/objfiles.c 2012-05-10 21:50:08.000000000 +0200
|
|
+++ gdb-7.4.50.20120602/gdb/objfiles.c 2012-06-02 19:52:58.202226502 +0200
|
|
@@ -802,6 +802,11 @@ objfile_relocate1 (struct objfile *objfi
|
|
objfile->sf->sym_probe_fns->sym_relocate_probe (objfile,
|
|
new_offsets, delta);
|
|
|
|
+ /* 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;
|
|
}
|