aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/linker.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index fbb76a9..a21a0b3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-14 Nick Clifton <nickc@cygnus.com>
+
+ * 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 cd7c4e1..6e9ee65 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)