make attaching adapters more robust

to make the behavior consistent across gdb versions, ignore the initial
*stopped which gdb7 delivers while attaching.

Reviewed-By: hjk

1 files changed, 2 insertions, 10 deletions

diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp
index 4c0968233f..0f6b50b6bd 100644
--- a/src/plugins/debugger/gdb/attachgdbadapter.cpp
+++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp
@@ -77,17 +77,9 @@ void AttachGdbAdapter::startInferior()
 
 void AttachGdbAdapter::handleAttach(const GdbResponse &response)
 {
+    QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
     if (response.resultClass == GdbResultDone) {
-        // We don't know the exact 6.8.50 build where gdb started emitting
-        // *stopped here, so allow for some slack.
-        if (m_engine->m_gdbVersion < 60850) {
-            QTC_ASSERT(state() == InferiorStarting, qDebug() << state());
-            setState(InferiorStopped);
-        } else if (m_engine->m_gdbVersion < 70000 && state() == InferiorStarting) {
-            setState(InferiorStopped);
-        } else {
-            QTC_ASSERT(state() == InferiorStopped, qDebug() << state());
-        }
+        setState(InferiorStopped);
         debugMessage(_("INFERIOR ATTACHED"));
         showStatusMessage(msgAttachedToStoppedInferior());
         emit inferiorPrepared();