From 28240dcd30bd657bf678cc62554794ca69ed3987 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 14 Jan 2000 18:13:40 +0000 Subject: [PATCH] fix mis-applied patch --- bfd/ChangeLog | 5 +++++ bfd/linker.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fbb76a9073a..a21a0b3558f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2000-01-14 Nick Clifton + + * linker.c (default_indirect_link_order): oops - fix incorrectly + applied patch from Tim Wall. + 2000-01-13 Timothy Wall (twall@tiac.net> * coffcode.h: Use bfd_coff_xxx instead of the macro XXX (where xxx diff --git a/bfd/linker.c b/bfd/linker.c index cd7c4e191bb..6e9ee65581b 100644 --- a/bfd/linker.c +++ b/bfd/linker.c @@ -2749,7 +2749,10 @@ default_indirect_link_order (output_bfd, info, output_section, link_order, /* Output the section contents. */ if (! bfd_set_section_contents (output_bfd, output_section, (PTR) new_contents, - link_order->offset, link_order->size)) + (file_ptr) + (link_order->offset * + bfd_octets_per_byte (output_bfd)), + link_order->size)) goto error_return; if (contents != NULL) -- 2.30.2