From 7d50aa29b809a2ba0e6b456255af3bbe5e275694 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 21 Oct 2009 11:11:28 +0200 Subject: [PATCH] work around -exec-until breakage on S60 gdb 6.4 --- src/plugins/debugger/gdb/gdbengine.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index dff58fe30f9..d6462e9db41 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -1616,8 +1616,13 @@ void GdbEngine::runToLineExec(const QString &fileName, int lineNumber) setTokenBarrier(); setState(InferiorRunningRequested); showStatusMessage(tr("Run to line %1 requested...").arg(lineNumber), 5000); - postCommand(_("-exec-until %1:%2").arg(fileName).arg(lineNumber), - RunRequest, CB(handleExecContinue)); + if (m_gdbVersion < 60500) { // We just know that 6.4 on S60 is broken + postCommand(_("tbreak %1:%2").arg(fileName).arg(lineNumber)); + postCommand(_("-exec-continue"), RunRequest, CB(handleExecContinue)); + } else { + postCommand(_("-exec-until %1:%2").arg(fileName).arg(lineNumber), + RunRequest, CB(handleExecContinue)); + } } void GdbEngine::runToFunctionExec(const QString &functionName)