Branch: master

8b81bdc8 2014-05-14 01:26:09 Michele Calgaro
Improved detection of gdb from GdbDriver (now aligned to detection used
in Kdbg v2.5.4). This resolves bug 1996 again.
M kdbg/gdbdriver.cpp
diff --git a/kdbg/gdbdriver.cpp b/kdbg/gdbdriver.cpp
index 61c09e4..5a5ec05 100644
--- a/kdbg/gdbdriver.cpp
+++ b/kdbg/gdbdriver.cpp
@@ -2083,9 +2083,12 @@
      *     Using host libthread_db
      *     (no debugging symbols found)
      */
-    while (strncmp(output, "Using host libthread_db", 23) == 0 ||
-	   strncmp(output, "(no debugging symbols found)", 28) == 0 ||
-	   strncmp(output, "Reading symbols from", 20) == 0)
+    while (strncmp(output, "Reading symbols from", 20) == 0 ||
+	   strncmp(output, "done.", 5) == 0 ||
+	   strncmp(output, "Missing separate debuginfo", 26) == 0 ||
+	   strncmp(output, "Try: ", 5) == 0 ||
+	   strncmp(output, "Using host libthread_db", 23) == 0 ||
+	   strncmp(output, "(no debugging symbols found)", 28) == 0)
     {
 	// this line is good, go to the next one
 	const char* end = strchr(output, '\n');