mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

Bug 369622 - Move to line fails using MinGW GDB

Browse source
This commit is contained in:
Raphael Zulliger 2012-03-06 12:47:45 -05:00 • committed by Marc-Andre Laperle
parent 406cabd6e7
commit 9634e0c57f
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBRunControl_7_0_NS.java
View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -8,6 +8,7 @@
* Contributors: * Contributors:
* Wind River Systems - initial API and implementation * Wind River Systems - initial API and implementation
* Ericsson AB - Modified for handling of multiple threads * Ericsson AB - Modified for handling of multiple threads
* Indel AG - [369622] fixed moveToLine using MinGW
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.dsf.gdb.service; package org.eclipse.cdt.dsf.gdb.service;
@ -1786,6 +1787,9 @@ public class GDBRunControl_7_0_NS extends AbstractDsfService implements IMIRunCo
} }
else else
{ {
// Hack around a MinGW bug; see 369622 (and also 196154 and 232415)
sourceFile = adjustDebuggerPath(sourceFile);
String location = sourceFile + ":" + lineNumber; //$NON-NLS-1$ String location = sourceFile + ":" + lineNumber; //$NON-NLS-1$
if (resume) if (resume)
resumeAtLocation(context, location, rm); resumeAtLocation(context, location, rm);

8
dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIRunControl.java
View file

@ -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 * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -9,6 +9,7 @@
* Wind River Systems - initial API and implementation * Wind River Systems - initial API and implementation
* Ericsson AB - Modified for handling of multiple threads * Ericsson AB - Modified for handling of multiple threads
* Vladimir Prus (Mentor Graphics) - Add proper stop reason for step return (Bug 362274) * 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; package org.eclipse.cdt.dsf.mi.service;
@ -1492,7 +1493,10 @@ public class MIRunControl extends AbstractDsfService implements IMIRunControl, I
rm.done(); rm.done();
} }
else else
{ {
// Hack around a MinGW bug; see 369622 (and also 196154 and 232415)
sourceFile = MIBreakpointsManager.adjustDebuggerPath(sourceFile);
String location = sourceFile + ":" + lineNumber; //$NON-NLS-1$ String location = sourceFile + ":" + lineNumber; //$NON-NLS-1$
if (resume) if (resume)
resumeAtLocation(context, location, rm); resumeAtLocation(context, location, rm);