forked from qt-creator/qt-creator
Debugger: Remove gdb-work-around-trk-single-step.patch
Symbian is gone, and so is TRK. Change-Id: I058e02d8990c5de0b9aa2f29ba7caebc30148f6d Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
1
dist/gdb/Makefile.linux
vendored
1
dist/gdb/Makefile.linux
vendored
@@ -69,7 +69,6 @@ ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestag
|
|||||||
touch configure && \
|
touch configure && \
|
||||||
patch -p2 < ${broot}/patches/pythonhome-7.4.patch && \
|
patch -p2 < ${broot}/patches/pythonhome-7.4.patch && \
|
||||||
patch -p1 < ${broot}/patches/gdb-ipv6.patch && \
|
patch -p1 < ${broot}/patches/gdb-ipv6.patch && \
|
||||||
patch -p1 < ${broot}/patches/gdb-work-around-trk-single-step.patch
|
|
||||||
|
|
||||||
${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
|
${gdbtargets}: ${targetdir}/gdb-%: ${staging}/gdb-${version}/configure ${staging}/lib/libpython${pyversion}.a ${staging}/lib/libexpat.a | maketargetdir
|
||||||
test -e ${staging}/gdb-${version}-$* || mkdir ${staging}/gdb-${version}-$*
|
test -e ${staging}/gdb-${version}-$* || mkdir ${staging}/gdb-${version}-$*
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
|
|
||||||
NOTE: Apply to --target=arm-none-symbianelf builds only.
|
|
||||||
|
|
||||||
This works around the problem of TRK overshooting line-wise stepping by a few
|
|
||||||
instructions. This is not a gdb problem, but a TRK problem, but currently
|
|
||||||
easier to workaround on the gdb side. It's sufficient to apply for the
|
|
||||||
arm-none-symbianelf targeted gdbs only as TRK is the only probe known to have
|
|
||||||
this problem.
|
|
||||||
|
|
||||||
--- a/gdb/infrun.c
|
|
||||||
+++ b/gdb/infrun.c
|
|
||||||
@@ -5186,9 +5186,9 @@
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if ((stop_pc == stop_pc_sal.pc)
|
|
||||||
+ if (1 /* (stop_pc == stop_pc_sal.pc)
|
|
||||||
&& (ecs->event_thread->current_line != stop_pc_sal.line
|
|
||||||
- || ecs->event_thread->current_symtab != stop_pc_sal.symtab))
|
|
||||||
+ || ecs->event_thread->current_symtab != stop_pc_sal.symtab) */)
|
|
||||||
{
|
|
||||||
/* We are at the start of a different line. So stop. Note that
|
|
||||||
we don't stop if we step into the middle of a different line.
|
|
||||||
Reference in New Issue
Block a user