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

debugger: remove unued gnutarget parameter

Browse Source 
Change-Id: Ic1c663bb11f7bf9420b35686ddeb581d31242b7f
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-07-25 03:43:14 +02:00
parent 26e7ed14b7
commit 6cbcdf243f
4 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2724,8 +2724,6 @@ static QString formatStartParameters(DebuggerStartParameters &sp)
str << "Remote mount point: " << sp.remoteMountPoint str << "Remote mount point: " << sp.remoteMountPoint
<< " Local: " << sp.localMountDir << '\n'; << " Local: " << sp.localMountDir << '\n';
} }
if (!sp.gnuTarget.isEmpty())
str << "Gnu target: " << sp.gnuTarget << '\n';
str << "Sysroot: " << sp.sysRoot << '\n'; str << "Sysroot: " << sp.sysRoot << '\n';
str << "Debug Source Location: " << sp.debugSourceLocation.join(QLatin1String(":")) << '\n'; str << "Debug Source Location: " << sp.debugSourceLocation.join(QLatin1String(":")) << '\n';
str << "Symbol file: " << sp.symbolFileName << '\n'; str << "Symbol file: " << sp.symbolFileName << '\n';

1
src/plugins/debugger/debuggerstartparameters.h
View File

@@ -111,7 +111,6 @@ public:
QString qtInstallPath; QString qtInstallPath;
// Used by remote debugging. // Used by remote debugging.
QString remoteChannel; QString remoteChannel;
QString gnuTarget;
QString symbolFileName; QString symbolFileName;
bool useServerStartScript; bool useServerStartScript;
QString serverStartScript; QString serverStartScript;

3
src/plugins/debugger/gdb/remotegdbserveradapter.cpp
View File

@@ -181,13 +181,10 @@ void GdbRemoteServerEngine::setupInferior()
//const QByteArray sysroot = sp.sysroot.toLocal8Bit(); //const QByteArray sysroot = sp.sysroot.toLocal8Bit();
//const QByteArray remoteArch = sp.remoteArchitecture.toLatin1(); //const QByteArray remoteArch = sp.remoteArchitecture.toLatin1();
//const QByteArray gnuTarget = sp.gnuTarget.toLatin1();
const QString args = sp.processArgs; const QString args = sp.processArgs;
// if (!remoteArch.isEmpty()) // if (!remoteArch.isEmpty())
// postCommand("set architecture " + remoteArch); // postCommand("set architecture " + remoteArch);
// if (!gnuTarget.isEmpty())
// postCommand("set gnutarget " + gnuTarget);
const QString solibSearchPath = sp.solibSearchPath.join(QLatin1String(PATHSEP)); const QString solibSearchPath = sp.solibSearchPath.join(QLatin1String(PATHSEP));
if (!solibSearchPath.isEmpty()) if (!solibSearchPath.isEmpty())
postCommand("set solib-search-path " + solibSearchPath.toLocal8Bit()); postCommand("set solib-search-path " + solibSearchPath.toLocal8Bit());

8
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
View File

@@ -117,14 +117,6 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
params.startMode = AttachToRemoteServer; params.startMode = AttachToRemoteServer;
params.executable = runConfig->localExecutableFilePath(); params.executable = runConfig->localExecutableFilePath();
params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1"); params.remoteChannel = devConf->sshParameters().host + QLatin1String(":-1");
// TODO: This functionality should be inside the debugger.
ToolChain *tc = ToolChainProfileInformation::toolChain(profile);
if (tc) {
const Abi &abi = tc->targetAbi();
params.gnuTarget = QLatin1String(abi.architecture() == Abi::ArmArchitecture
? "arm-none-linux-gnueabi": "i386-unknown-linux-gnu");
}
} else { } else {
params.startMode = AttachToRemoteServer; params.startMode = AttachToRemoteServer;
} }