From: Nick Clifton <nickc@redhat.com>
Date: Wed, 7 Feb 2001 23:51:04 +0000 (+0000)
Subject: If stabs info is successfully found, do not attempt to find dwarf2 info
X-Git-Tag: binutils-2_11~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc04fcb4b8cc2b680548d2b65189abfde8d4f58e;p=thirdparty%2Fbinutils-gdb.git

If stabs info is successfully found, do not attempt to find dwarf2 info
before returning.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6330a85c1d0..29f0c4c974a 100644
--- 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 49b43edbd75..35e8f718e6a 100644
--- 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;