From 5a28377786be5eb25b16430c9e18fc8dfbea5549 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Wed, 10 Apr 2013 18:22:01 +0200
Subject: [PATCH] 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>
---
 dist/gdb/Makefile.linux                       |  1 -
 .../gdb-work-around-trk-single-step.patch     | 23 -------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 dist/gdb/patches/gdb-work-around-trk-single-step.patch

diff --git a/dist/gdb/Makefile.linux b/dist/gdb/Makefile.linux
index 94bf99bca9a..5a54137569f 100644
--- a/dist/gdb/Makefile.linux
+++ b/dist/gdb/Makefile.linux
@@ -69,7 +69,6 @@ ${staging}/gdb-${version}/configure: ${source}/gdb-${version}.tar.bz2 | makestag
 	touch configure && \
         patch -p2 < ${broot}/patches/pythonhome-7.4.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
 	test -e ${staging}/gdb-${version}-$* || mkdir ${staging}/gdb-${version}-$*
diff --git a/dist/gdb/patches/gdb-work-around-trk-single-step.patch b/dist/gdb/patches/gdb-work-around-trk-single-step.patch
deleted file mode 100644
index c4ea88a4e64..00000000000
--- a/dist/gdb/patches/gdb-work-around-trk-single-step.patch
+++ /dev/null
@@ -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.