gdb/

	* symtab.c (compare_filenames_for_search): New comment for
	HAS_DRIVE_SPEC.

gdb/testsuite/
	* gdb.dwarf2/dw2-dos-drive.S: New file.
	* gdb.dwarf2/dw2-dos-drive.exp: New file.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9aef3b8c0369bf34dbd016f58fcffd7e5778296a..95d16f30ded3246e8d6e8d206a6c2a8edd672378 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * symtab.c (compare_filenames_for_search): New comment for
+       HAS_DRIVE_SPEC.
+
 2013-01-17  Tom Tromey  <tromey@redhat.com>
 
        * cp-abi.c (cp_abi_completer): Fix typo in assignment.

diff --git a/gdb/symtab.c b/gdb/symtab.c
index c304f70b6a4e1b62fd2d2b5f4a565e644d8ffa1b..770f9e0bda2c5cbf8ab5e9eb2d2568ceab2372bf 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -164,7 +164,12 @@ compare_filenames_for_search (const char *filename, const char *search_name)
 
   /* Either the names must completely match, or the character
      preceding the trailing SEARCH_NAME segment of FILENAME must be a
-     directory separator.  */
+     directory separator.
+
+     The HAS_DRIVE_SPEC purpose is to make FILENAME "c:file.c"
+     compatible with SEARCH_NAME "file.c".  In such case a compiler had
+     to put the "c:file.c" name into debug info.  Such compatibility
+     works only on GDB built for DOS host.  */
   return (len == search_len
          || IS_DIR_SEPARATOR (filename[len - search_len - 1])
          || (HAS_DRIVE_SPEC (filename)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 621289b524a57f3233f6e474f9a008073aa803dd..d7d7e053800e2064902038326140a33a8747dcfd 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-17  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * gdb.dwarf2/dw2-dos-drive.S: New file.
+       * gdb.dwarf2/dw2-dos-drive.exp: New file.
+
 2013-01-17  Doug Evans  <dje@google.com>
 
        * boards/dwarf4-gdb-index.exp: Use any existing CC_FOR_TARGET,

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.S b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.S
new file mode 100644 (file)
index 0000000..682ba4e
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.S
@@ -0,0 +1,75 @@
+/* Copyright 2013 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+       .text
+pc_start:
+       .byte   0
+pc_end:
+
+       .section        .debug_info
+d:
+       .4byte  .Ldebug_info_end - 1f   /* Length of Compilation Unit Info */
+1:
+       .2byte  0x3     /* DWARF version number */
+       .4byte  .Ldebug_abbrev0 /* Offset Into Abbrev. Section */
+       .byte   0x4     /* Pointer Size (in bytes) */
+dieb:
+       .uleb128 0x1    /* (DIE (0xb) DW_TAG_compile_unit) */
+       .ascii  "GCC\0" /* DW_AT_producer */
+       .byte   0x2     /* DW_AT_language = DW_LANG_C */
+       .ascii  "z:file.c\0"    /* DW_AT_name */
+
+       .uleb128 0x2            /* (DIE (0xd3) DW_TAG_subprogram) */
+       .byte   0x1             /* DW_AT_external */
+       .ascii  "func\0"        /* DW_AT_name */
+       .4byte  pc_start        /* DW_AT_low_pc */
+       .4byte  pc_end          /* DW_AT_high_pc */
+       .byte   0x1             /* DW_AT_prototyped */
+
+       .byte   0x0     /* end of children of DIE 0xb */
+.Ldebug_info_end:
+
+       .section        .debug_abbrev
+.Ldebug_abbrev0:
+
+       .uleb128 0x1    /* (abbrev code) */
+       .uleb128 0x11   /* (TAG: DW_TAG_compile_unit) */
+       .byte   0x1     /* DW_children_yes */
+       .uleb128 0x25   /* (DW_AT_producer) */
+       .uleb128 0x8    /* (DW_FORM_string) */
+       .uleb128 0x13   /* (DW_AT_language) */
+       .uleb128 0xb    /* (DW_FORM_data1) */
+       .uleb128 0x3    /* (DW_AT_name) */
+       .uleb128 0x8    /* (DW_FORM_string) */
+       .byte   0x0
+       .byte   0x0
+
+       .uleb128 0x2    /* (abbrev code) */
+       .uleb128 0x2e   /* (DW_TAG_subprogram) */
+       .byte   0x0     /* DW_children_no */
+       .uleb128 0x3f   /* (DW_AT_external) */
+       .uleb128 0xc    /* (DW_FORM_flag) */
+       .uleb128 0x3    /* (DW_AT_name) */
+       .uleb128 0x8    /* (DW_FORM_string) */
+       .uleb128 0x11   /* (DW_AT_low_pc) */
+       .uleb128 0x1    /* (DW_FORM_addr) */
+       .uleb128 0x12   /* (DW_AT_high_pc) */
+       .uleb128 0x1    /* (DW_FORM_addr) */
+       .uleb128 0x27   /* (DW_AT_prototyped) */
+       .uleb128 0xc    /* (DW_FORM_flag) */
+       .byte   0x0
+       .byte   0x0
+
+       .byte   0x0

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp
new file mode 100644 (file)
index 0000000..ecfd23a
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dos-drive.exp
@@ -0,0 +1,41 @@
+# Copyright 2013 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+load_lib dwarf.exp
+
+if {![dwarf2_support]} {
+    return 0  
+}
+
+standard_testfile .S
+set executable ${testfile}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
+    return -1
+}
+
+clean_restart $executable
+
+gdb_test_no_output "set breakpoint pending off"
+
+gdb_test "break 'z:file.c':func" {Breakpoint [0-9]+ at .*}
+
+set dos [expr [istarget "*-*-cygwin*"] || [istarget "i?86-*-mingw*"] \
+             || [istarget "*-*-msdosdjgpp*"] || [istarget "*-*-go32*"] ]
+
+if { $dos } {
+    gdb_test "break file.c:func" {Breakpoint [0-9]+ at .*}
+} else {
+    unsupported "break file.c:func"
+}