If stabs info is successfully found, do not attempt to find dwarf2 info

before returning.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3b5442b4eb52311a9567c2353cad3dd9da89a7c1..6e0775d419268f6d243f0e04e2bab63c07fda6ca 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-07  Mark Elbrecht  <snowball3@bigfoot.com>
+
+       * coffgen.c (coff_find_nearest_line): If stabs info is successfully
+       found, do not attempt to find dwarf2 info before returning.
+
 2001-02-07  Jakub Jelinek  <jakub@redhat.com>
 
        * elflink.h (is_global_symbol_definition): Rename to

diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index 49b43edbd751fe9c8cdb30216292daaac5e14f79..35e8f718e6a36396d2ff81ba173f0696fdf4c6ba 100644 (file)
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -2188,6 +2188,9 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                                             &coff_data(abfd)->line_info))
     return false;
 
+  if (found)
+    return true;
+
   /* Also try examining DWARF2 debugging information.  */
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
                                     filename_ptr, functionname_ptr,
@@ -2195,9 +2198,6 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                                     &coff_data(abfd)->dwarf2_find_line_info))
     return true;
 
-if (found)
-    return true;
-
   *filename_ptr = 0;
   *functionname_ptr = 0;
   *line_ptr = 0;