Index: dbxread.c
===================================================================
RCS file: /cvs/src/src/gdb/dbxread.c,v
retrieving revision 1.67
diff -c -p -r1.67 dbxread.c
*** dbxread.c	10 Jun 2004 20:05:43 -0000	1.67
--- dbxread.c	16 Jun 2004 16:51:05 -0000
*************** process_one_symbol (int type, int desc, 
*** 2672,2680 ****
    static CORE_ADDR last_function_start;
  
    /* If this is nonzero, we've seen an N_SLINE since the start of the
!      current function.  We use this to tell us to move the first sline
!      to the beginning of the function regardless of what its given
!      value is. */
    static int sline_found_in_function = 1;
  
    /* If this is nonzero, we've seen a non-gcc N_OPT symbol for this source
--- 2672,2678 ----
    static CORE_ADDR last_function_start;
  
    /* If this is nonzero, we've seen an N_SLINE since the start of the
!      current function.  */
    static int sline_found_in_function = 1;
  
    /* If this is nonzero, we've seen a non-gcc N_OPT symbol for this source
*************** process_one_symbol (int type, int desc, 
*** 2962,2976 ****
  #ifdef SUN_FIXED_LBRAC_BUG
        last_pc_address = valu;	/* Save for SunOS bug circumcision */
  #endif
-       /* If this is the first SLINE note in the function, record it at
- 	 the start of the function instead of at the listed location.  */
        if (within_function && sline_found_in_function == 0)
- 	{
- 	  record_line (current_subfile, desc, last_function_start);
  	  sline_found_in_function = 1;
! 	}
!       else
! 	record_line (current_subfile, desc, valu);
        break;
  
      case N_BCOMM:
--- 2960,2968 ----
  #ifdef SUN_FIXED_LBRAC_BUG
        last_pc_address = valu;	/* Save for SunOS bug circumcision */
  #endif
        if (within_function && sline_found_in_function == 0)
  	  sline_found_in_function = 1;
!       record_line (current_subfile, desc, valu);
        break;
  
      case N_BCOMM:
*************** process_one_symbol (int type, int desc, 
*** 3117,3123 ****
  		     it is likely that the value was set correctly to begin
  		     with... */
  		  if (minsym_valu != 0)
! 		    valu = minsym_valu;
  		}
  #endif
  
--- 3109,3115 ----
  		     it is likely that the value was set correctly to begin
  		     with... */
  		  if (minsym_valu != 0)
! 		    last_function_start = valu = minsym_valu;
  		}
  #endif