summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Zulliger2012-03-06 12:47:45 (EST)
committer Marc-Andre Laperle2012-03-06 12:47:45 (EST)
commit9634e0c57f0f88605597e7768b2f9d6a06c89940 (patch)
treeb94bcc753e916aa1e859a0b4d8cd9b9ab8612232
parent406cabd6e7b6fb3a08951766fba90119e8b72918 (diff)
downloadorg.eclipse.cdt-9634e0c57f0f88605597e7768b2f9d6a06c89940.zip
org.eclipse.cdt-9634e0c57f0f88605597e7768b2f9d6a06c89940.tar.gz
org.eclipse.cdt-9634e0c57f0f88605597e7768b2f9d6a06c89940.tar.bz2
Bug 369622 - Move to line fails using MinGW GDB
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java6
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java8
2 files changed, 11 insertions, 3 deletions
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
index 37f61e0..490f50e 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 Wind River Systems and others.
+ * Copyright (c) 2006, 2012 Wind River Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
* Contributors:
* Wind River Systems - initial API and implementation
* Ericsson AB - Modified for handling of multiple threads
+ * Indel AG - [369622] fixed moveToLine using MinGW
*******************************************************************************/
package org.eclipse.cdt.dsf.gdb.service;
@@ -1786,6 +1787,9 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService implements IMIRunCo
}
else
{
+ // Hack around a MinGW bug; see 369622 (and also 196154 and 232415)
+ sourceFile = adjustDebuggerPath(sourceFile);
+
String location = sourceFile + ":" + lineNumber; //$NON-NLS-1$
if (resume)
resumeAtLocation(context, location, rm);
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
index eb6a5a6..b9a9776 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 Wind River Systems and others.
+ * Copyright (c) 2006, 2012 Wind River Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
* Wind River Systems - initial API and implementation
* Ericsson AB - Modified for handling of multiple threads
* Vladimir Prus (Mentor Graphics) - Add proper stop reason for step return (Bug 362274)
+ * Indel AG - [369622] fixed moveToLine using MinGW
*******************************************************************************/
package org.eclipse.cdt.dsf.mi.service;
@@ -1492,7 +1493,10 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
rm.done();
}
else
- {
+ {
+ // Hack around a MinGW bug; see 369622 (and also 196154 and 232415)
+ sourceFile = MIBreakpointsManager.adjustDebuggerPath(sourceFile);
+
String location = sourceFile + ":" + lineNumber; //$NON-NLS-1$
if (resume)
resumeAtLocation(context, location, rm);