From: Nick Clifton <nickc@redhat.com>
Date: Wed, 17 Apr 2002 07:27:26 +0000 (+0000)
Subject: Fix code to prevent records crossing a 64K boundary
X-Git-Tag: binutils-2_12_1~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7b6d1be817f7a2dfd03163633f5aa67917edee1;p=thirdparty%2Fbinutils-gdb.git

Fix code to prevent records crossing a 64K boundary
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f58ffce6fe4..233927e01fd 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-16  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* ihex.c (ihex_write_object_contents): Fix check for records
+	crossing 64K boundaries.
+
 2002-04-06  Hans-Peter Nilsson  <hp@axis.com>
 
 	* elf32-cris.c (cris_elf_howto_table) <R_CRIS_16_PCREL,
diff --git a/bfd/ihex.c b/bfd/ihex.c
index 613eaf3b189..2e4494d1303 100644
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -875,8 +875,8 @@ ihex_write_object_contents (abfd)
 	  rec_addr = where - (extbase + segbase);
 
           /* Output records shouldn't cross 64K boundaries.  */
-          if (rec_addr + now > 0xfffff)
-            now = 0xffff - rec_addr;
+          if (rec_addr + now > 0xffff)
+            now = 0x10000 - rec_addr;
 
 	  if (! ihex_write_record (abfd, now, rec_addr, 0, p))
 	    return false;