For N_SLINE only include function_start_offset if the symbol is within a

function; otherwise, the value is absolute.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index ada0c4a0524010a7624804e1aef76e30945226b8..55db2d6a92a3b18e836db0b235d588c0d11de1c6 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -8,6 +8,10 @@
 
        * debug.c (debug_record_variable): Handle global register variables.
 
+       * stabs.c (parse_stab): For N_SLINE only include
+       function_start_offset if the symbol is within a function;
+       otherwise, the value is absolute.
+
 2003-02-10  Nick Clifton  <[email protected]>
 
        * readelf.c (decode_ARM_machine_flags): Handle the

diff --git a/binutils/stabs.c b/binutils/stabs.c
index 1ff4f6f60d220903a26be3495a4bcf53b62459bf..2611bc3237a245148fc65d6e739523e9fb774a92 100644 (file)
--- a/binutils/stabs.c
+++ b/binutils/stabs.c
@@ -1,5 +1,5 @@
 /* stabs.c -- Parse stabs debugging information
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor <[email protected]>.
 
@@ -176,8 +176,8 @@ static debug_type parse_stab_sun_floating_type
 static debug_type parse_stab_enum_type
   PARAMS ((PTR, const char **));
 static debug_type parse_stab_struct_type
-  PARAMS ((PTR, struct stab_handle *, const char *, const char **, bfd_boolean,
-          const int *));
+  PARAMS ((PTR, struct stab_handle *, const char *, const char **,
+          bfd_boolean, const int *));
 static bfd_boolean parse_stab_baseclasses
   PARAMS ((PTR, struct stab_handle *, const char **, debug_baseclass **));
 static bfd_boolean parse_stab_struct_fields
@@ -222,7 +222,8 @@ static debug_type stab_find_tagged_type
   PARAMS ((PTR, struct stab_handle *, const char *, int,
           enum debug_type_kind));
 static debug_type *stab_demangle_argtypes
-  PARAMS ((PTR, struct stab_handle *, const char *, bfd_boolean *, unsigned int));
+  PARAMS ((PTR, struct stab_handle *, const char *, bfd_boolean *,
+          unsigned int));
 
 /* Save a string in memory.  */
 
@@ -610,7 +611,8 @@ parse_stab (dhandle, handle, type, desc, value, string)
 
     case N_SLINE:
       if (! debug_record_line (dhandle, desc,
-                              value + info->function_start_offset))
+                              value + (info->within_function
+                                       ? info->function_start_offset : 0)))
        return FALSE;
       break;