From 4ca29a6acf8ea8917ce12bd7435dff7afbdc2ba6 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 7 Feb 2001 23:50:04 +0000 Subject: [PATCH] If stabs info is successfully found, do not attempt to find dwarf2 info before returning. --- bfd/ChangeLog | 5 +++++ bfd/coffgen.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3b5442b4eb..6e0775d419 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2001-02-07 Mark Elbrecht + + * 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 * elflink.h (is_global_symbol_definition): Rename to diff --git a/bfd/coffgen.c b/bfd/coffgen.c index 49b43edbd7..35e8f718e6 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; -- 2.34.1