Pass dwarf2_find_line_info as last parameter to invocation of

_bfd_dwarf2_find_nearest_line.

3 files changed, 29 insertions, 14 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ec92e09..568f2c7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,31 +1,44 @@
+2000-12-09  Nick Clifton  <nickc@redhat.com>
+
+	* elf32-mips.c (_bfd_mips_elf_find_nearest_line): Pass
+	dwarf2_find_line_info as last parameter to invocation of
+	_bfd_dwarf2_find_nearest_line.
+	* elf32-arm.h (elf32_arm_find_nearest_line): Pass
+	dwarf2_find_line_info as last parameter to invocation of
+	_bfd_dwarf2_find_nearest_line.
+
 2000-12-08  Mark Elbrecht  <snowball3@bigfoot.com>
 
 	* Makefile.am (BFD32_BACKENDS): Move dwarf2.lo from here...
-	  (BFD_LIBS): ...to here.
-	  (BFD32_BACKENDS_CFILES): Move dwarf2.c from here...
-	  (BFD_LIBS_CFILES): ...to here.
+	(BFD_LIBS): ...to here.
+	(BFD32_BACKENDS_CFILES): Move dwarf2.c from here...
+	(BFD_LIBS_CFILES): ...to here.
 	* Makefile.in: Regenerate.
 	* configure.in: Remove dwarf.lo from the elf shell variable.
 	* configure: Regenerate.
 	* libcoff-in.h (coff_tdata): Add pointer dwarf2_find_line_info.
 	* libcoff.h: Regenerate.
 	* coffgen.c (coff_find_nearest_line): Call 
-	  _bfd_dwarf2_find_nearest_line.
+	_bfd_dwarf2_find_nearest_line.
 	* dwarf2.c (_bfd_dwarf2_find_nearest_line): Add parameter. Update
-	  accordingly.
-	  (read_abbrevs): Likewise
-	  (decode_line_info): Likewise.
-	  (parse_comp_unit): Likewise.
-	  (comp_unit_find_nearest_line): Likewise.
+	accordingly.
+	(read_abbrevs): Likewise
+	(decode_line_info): Likewise.
+	(parse_comp_unit): Likewise.
+	(comp_unit_find_nearest_line): Likewise.
 	* libbfd-in.h (_bfd_dwarf2_find_nearest_line): Update prototype.
 	* libbfd.h: Regenerate.
 	* elf.c (_bfd_elf_find_nearest_line): Update call.
 	* elf-bfd.h (elf_obj_tdata): Change dwarf2_find_line_info to type PTR.
 	* dwarf2.c (concat_filename): Use IS_ABSOLUTE_PATH.
 	* coffcode.h (STYP_XCOFF_DEBUG, STYP_DEBUG_INFO): New macros.
-	  (sec_to_styp_flags): Use them. Handle DWARF2 sections.
-	  (styp_to_sec_flags): Handle DWARF2 sections.
-
+	(sec_to_styp_flags): Use them. Handle DWARF2 sections.
+	(styp_to_sec_flags): Handle DWARF2 sections.
+	* elf32-arm.h (elf32_arm_find_nearest_line): Add parameter to call
+	to _bfd_find_nearest_line.
+	* elf32-mips.c (_bfd_mips_elf_find_nearest_line): Add parameter to
+	call to _bfd_find_nearest_line.
+	  
 2000-12-08  Kazu Hirata  <kazu@hxi.com>
 
 	* coffgen.c: Fix formatting.
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 4b910a8..abda34d 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -2642,7 +2642,8 @@ elf32_arm_find_nearest_line
 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
-				     line_ptr, 0, NULL))
+				     line_ptr, 0,
+				     &elf_tdata (abfd)->dwarf2_find_line_info))
     return true;
 
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 9af14d6..dd3ee18 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -3736,7 +3736,8 @@ _bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
 				     filename_ptr, functionname_ptr,
 				     line_ptr,
-				     ABI_64_P (abfd) ? 8 : 0, NULL))
+				     ABI_64_P (abfd) ? 8 : 0,
+				     &elf_tdata (abfd)->dwarf2_find_line_info))
     return true;
 
   msec = bfd_get_section_by_name (abfd, ".mdebug");