Index: dwarf2read.c
===================================================================
RCS file: /cvs/src/src/gdb/dwarf2read.c,v
retrieving revision 1.156
diff -u -p -r1.156 dwarf2read.c
--- dwarf2read.c	6 Jul 2004 19:29:30 -0000	1.156
+++ dwarf2read.c	25 Jul 2004 15:02:45 -0000
@@ -5926,6 +5926,18 @@ dwarf_decode_lines (struct line_header *
   CORE_ADDR baseaddr;
   struct objfile *objfile = cu->objfile;
   const int decode_for_pst_p = (pst != NULL);
+  
+  /* Normally, we detect the list of files that are really included by
+     scanning the LNP for DW_LNS_set_file.  However, the initial value
+     for the file register is 1, which means that the program is allowed
+     to omit the set_file instruction at the begining if the first
+     instructions refer to that file.  In order to detect that case,
+     we use this FIRST_SET_FILE_FOUND boolean that will be set as soon
+     as we encounter the a set_file instruction.  If, in the meantime,
+     we find any instruction that does change the address, line or
+     column registers, then it means that file 1 was indeed included.  */
+  int first_set_file_found = 0;
+  int file_one_included_p = 0;
 
   baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
 
@@ -5977,6 +5989,8 @@ dwarf_decode_lines (struct line_header *
 	          record_line (current_subfile, line, 
 	                       check_cu_functions (address, cu));
                 }
+             if (!first_set_file_found)
+               file_one_included_p = 1;
 	      basic_block = 1;
 	    }
 	  else switch (op_code)
@@ -5997,6 +6011,8 @@ dwarf_decode_lines (struct line_header *
 		  address = read_address (abfd, line_ptr, cu, &bytes_read);
 		  line_ptr += bytes_read;
 		  address += baseaddr;
+                 if (!first_set_file_found)
+                   file_one_included_p = 1;
 		  break;
 		case DW_LNE_define_file:
                   {
@@ -6028,15 +6044,21 @@ dwarf_decode_lines (struct line_header *
 	        record_line (current_subfile, line, 
 	                     check_cu_functions (address, cu));
 	      basic_block = 0;
+             if (!first_set_file_found)
+               file_one_included_p = 1;
 	      break;
 	    case DW_LNS_advance_pc:
 	      address += lh->minimum_instruction_length
 		* read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
 	      line_ptr += bytes_read;
+             if (!first_set_file_found)
+               file_one_included_p = 1;
 	      break;
 	    case DW_LNS_advance_line:
 	      line += read_signed_leb128 (abfd, line_ptr, &bytes_read);
 	      line_ptr += bytes_read;
+             if (!first_set_file_found)
+               file_one_included_p = 1;
 	      break;
 	    case DW_LNS_set_file:
               {
@@ -6055,11 +6077,14 @@ dwarf_decode_lines (struct line_header *
                   dir = comp_dir;
                 if (!decode_for_pst_p)
                   dwarf2_start_subfile (fe->name, dir);
+                first_set_file_found = 1;
               }
 	      break;
 	    case DW_LNS_set_column:
 	      column = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
 	      line_ptr += bytes_read;
+             if (!first_set_file_found)
+               file_one_included_p = 1;
 	      break;
 	    case DW_LNS_negate_stmt:
 	      is_stmt = (!is_stmt);
@@ -6075,10 +6100,14 @@ dwarf_decode_lines (struct line_header *
 	    case DW_LNS_const_add_pc:
 	      address += (lh->minimum_instruction_length
 			  * ((255 - lh->opcode_base) / lh->line_range));
+             if (!first_set_file_found)
+               file_one_included_p = 1;
 	      break;
 	    case DW_LNS_fixed_advance_pc:
 	      address += read_2_bytes (abfd, line_ptr);
 	      line_ptr += 2;
+             if (!first_set_file_found)
+               file_one_included_p = 1;
 	      break;
 	    default:
 	      {  /* Unknown standard opcode, ignore it.  */
@@ -6097,6 +6126,9 @@ dwarf_decode_lines (struct line_header *
     {
       int file_index;
 
+      if (file_one_included_p)
+        lh->file_names[0].included_p = 1;
+
       /* Now that we're done scanning the Line Header Program, we can
          create the psymtab of each included file.  */
       for (file_index = 0; file_index < lh->num_file_names; file_index++)