aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/coffgen.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3b5442b..6e0775d 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-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 49b43ed..35e8f71 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;