feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix debugging 32-bit mingw console app with 64-bit gdb

Browse Source 
For some reason, the executable is no determined correctly.

Feed it to gdb so it will have correct debugging symbols.

Fixes: QTCREATORBUG-26208
Change-Id: Id7da405e5ec9f9331399eb049fa383099981cb94
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Orgad Shaneh
2021-09-03 12:26:02 +03:00
committed by Orgad Shaneh
parent 4c35c9e057
commit 9032c7741a
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4274,9 +4274,14 @@ void GdbEngine::debugLastCommand()
runCommand(m_lastDebuggableCommand);
}
bool GdbEngine::isLocalRunEngine() const
{
return !isCoreEngine() && !isLocalAttachEngine() && !isRemoteEngine();
}
bool GdbEngine::isPlainEngine() const
{
return !isCoreEngine() && !isLocalAttachEngine() && !isRemoteEngine() && !terminal();
return isLocalRunEngine() && !terminal();
}
bool GdbEngine::isCoreEngine() const
@@ -4297,7 +4302,7 @@ bool GdbEngine::isLocalAttachEngine() const
bool GdbEngine::isTermEngine() const
{
return !isCoreEngine() && !isLocalAttachEngine() && !isRemoteEngine() && terminal();
return isLocalRunEngine() && terminal();
}
bool GdbEngine::usesOutputCollector() const
@@ -4457,8 +4462,9 @@ void GdbEngine::setupInferior()
? QString("Going to attach to %1 (%2)").arg(attachedPID).arg(attachedMainThreadID)
: QString("Going to attach to %1").arg(attachedPID);
showMessage(msg, LogMisc);
handleInferiorPrepared();
const QString executable = runParameters().inferior.executable.toFileInfo().absoluteFilePath();
runCommand({"-file-exec-and-symbols \"" + executable + '"',
CB(handleFileExecAndSymbols)});
} else if (isPlainEngine()) {
setEnvironmentVariables();
@@ -4707,7 +4713,7 @@ void GdbEngine::handleFileExecAndSymbols(const DebuggerResponse &response)
notifyInferiorSetupFailedHelper(msg);
}
} else if (isPlainEngine()) {
} else if (isLocalRunEngine()) {
if (response.resultClass == ResultDone) {
handleInferiorPrepared();