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

before returning.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6330a85c1d0aa80b917659f64c37240f64f1ced6..29f0c4c974a45188f918e0cdd7eb1430a36f1354 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-01-30  Alan Modra  <alan@linuxcare.com.au>
 
        * elf64-hppa.c (elf64_hppa_elf_get_symbol_type): New function.

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;