From 6cbcdf243fa225be18fa4a3e6ab0dedf296bf7ef Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 25 Jul 2012 03:43:14 +0200 Subject: [PATCH] debugger: remove unued gnutarget parameter Change-Id: Ic1c663bb11f7bf9420b35686ddeb581d31242b7f Reviewed-by: hjk --- src/plugins/debugger/debuggerplugin.cpp | 2 -- src/plugins/debugger/debuggerstartparameters.h | 1 - src/plugins/debugger/gdb/remotegdbserveradapter.cpp | 3 --- src/plugins/remotelinux/remotelinuxdebugsupport.cpp | 8 -------- 4 files changed, 14 deletions(-) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 5284797f7ac..d549c0213b1 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2724,8 +2724,6 @@ static QString formatStartParameters(DebuggerStartParameters &sp) str << "Remote mount point: " << sp.remoteMountPoint << " Local: " << sp.localMountDir << '\n'; } - if (!sp.gnuTarget.isEmpty()) - str << "Gnu target: " << sp.gnuTarget << '\n'; str << "Sysroot: " << sp.sysRoot << '\n'; str << "Debug Source Location: " << sp.debugSourceLocation.join(QLatin1String(":")) << '\n'; str << "Symbol file: " << sp.symbolFileName << '\n'; diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index 87787b848a9..8ede708d611 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -111,7 +111,6 @@ public: QString qtInstallPath; // Used by remote debugging. QString remoteChannel; - QString gnuTarget; QString symbolFileName; bool useServerStartScript; QString serverStartScript; diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp index d33b850c0cd..61b03434473 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp @@ -181,13 +181,10 @@ void GdbRemoteServerEngine::setupInferior() //const QByteArray sysroot = sp.sysroot.toLocal8Bit(); //const QByteArray remoteArch = sp.remoteArchitecture.toLatin1(); - //const QByteArray gnuTarget = sp.gnuTarget.toLatin1(); const QString args = sp.processArgs; // if (!remoteArch.isEmpty()) // postCommand("set architecture " + remoteArch); -// if (!gnuTarget.isEmpty()) -// postCommand("set gnutarget " + gnuTarget); const QString solibSearchPath = sp.solibSearchPath.join(QLatin1String(PATHSEP)); if (!solibSearchPath.isEmpty()) postCommand("set solib-search-path " + solibSearchPath.toLocal8Bit()); diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp index 3251cfeb9b3..ead5c41193e 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp @@ -117,14 +117,6 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R params.startMode = AttachToRemoteServer; params.executable = runConfig->localExecutableFilePath(); 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 { params.startMode = AttachToRemoteServer; }