gdb/

	* symfile.c (find_separate_debug_file_by_debuglink): Remove
	a gdb_assert call, new comment.

gdb/testsuite/
	* gdb.base/solib-nodir.exp: New file.
	* lib/gdb.exp (runto): New case for a GDB internal error.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1fbf5f81bfd1aba8ad56864449c6e51a3ef97b55..67184843ad42aee61fa6e0da43e42f82c6dd0a22 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * symfile.c (find_separate_debug_file_by_debuglink): Remove
+       a gdb_assert call, new comment.
+
 2010-07-16  Thiago Jung Bauermann  <bauerman@br.ibm.com>
 
        * NEWS: Mention support for the new ptrace interface and hardware

diff --git a/gdb/symfile.c b/gdb/symfile.c
index ab51fa4ed166702f7155077f859fcc4c224430d8..42f7ae3e07448f7982831218edc30eba83b3902b 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1371,15 +1371,13 @@ find_separate_debug_file_by_debuglink (struct objfile *objfile)
   dir = xstrdup (objfile->name);
 
   /* Strip off the final filename part, leaving the directory name,
-     followed by a slash.  Objfile names should always be absolute and
-     tilde-expanded, so there should always be a slash in there
-     somewhere.  */
+     followed by a slash.  The directory can be relative or absolute.  */
   for (i = strlen(dir) - 1; i >= 0; i--)
     {
       if (IS_DIR_SEPARATOR (dir[i]))
        break;
     }
-  gdb_assert (i >= 0 && IS_DIR_SEPARATOR (dir[i]));
+  /* If I is -1 then no directory is present there and DIR will be "".  */
   dir[i+1] = '\0';
 
   /* Set I to max (strlen (canon_name), strlen (dir)). */

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9e82cd3be4662360f4d8a560e0700af2a2114bf7..bbe4896bc5aa1afb5b55d59f9fe2d924476d1ef8 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * gdb.base/solib-nodir.exp: New file.
+       * lib/gdb.exp (runto): New case for a GDB internal error.
+
 2010-07-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
            Ulrich Weigand  <uweigand@de.ibm.com>
            Tom Tromey  <tromey@redhat.com>

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index b5b33628f9be9f3b569f9060d8e7f2bef017d94d..20e2fb771f73343448a4dd79248b2ef4ac566db0 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -423,6 +423,11 @@ proc runto { function args } {
            unsupported "Non-stop mode not supported"
            return 0
        }
+       -re ".*A problem internal to GDB has been detected" {
+           fail "running to $function in runto (GDB internal error)"
+           gdb_internal_error_resync
+           return 0
+       }
        -re "$gdb_prompt $" { 
            fail "running to $function in runto"
            return 0