From: Alan Modra <amodra@gmail.com>
Date: Wed, 8 Jun 2022 03:56:27 +0000 (+0930)
Subject: coff-z80 reloc howto fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24d34d81eacbce13854d99f390240e6ad63d38a6;p=binutils-gdb.git

coff-z80 reloc howto fixes

Mostly cosmetic unless attempting to link coff-z80 into another output
format.

	* coff-z80.c (howto_table <R_IMM24, R_WORD0, R_WORD1>): Correct size.
	(extra_case): Use bfd_{get,put}_24 when applying R_IMM24.
---

diff --git a/bfd/coff-z80.c b/bfd/coff-z80.c
index 1fefee44b13..fd3c84a196e 100644
--- a/bfd/coff-z80.c
+++ b/bfd/coff-z80.c
@@ -60,7 +60,7 @@ static bfd_howto_type howto_table[] =
   BFD_HOWTO (BFD_RELOC_24,
      R_IMM24,		/* type */
      0,			/* rightshift */
-     1,			/* size (0 = byte, 1 = short, 2 = long) */
+     5,			/* size (0 = byte, 1 = short, 2 = long) */
      24,		/* bitsize */
      false,		/* pc_relative */
      0,			/* bitpos */
@@ -195,7 +195,7 @@ static bfd_howto_type howto_table[] =
   BFD_HOWTO (BFD_RELOC_Z80_WORD0,
      R_WORD0,		/* type */
      0,			/* rightshift */
-     0,			/* size (0 = byte, 1 = short, 2 = long) */
+     1,			/* size (0 = byte, 1 = short, 2 = long) */
      16,		/* bitsize */
      false,		/* pc_relative */
      0,			/* bitpos */
@@ -210,7 +210,7 @@ static bfd_howto_type howto_table[] =
   BFD_HOWTO (BFD_RELOC_Z80_WORD1,
      R_WORD1,		/* type */
      16,		/* rightshift */
-     0,			/* size (0 = byte, 1 = short, 2 = long) */
+     1,			/* size (0 = byte, 1 = short, 2 = long) */
      16,		/* bitsize */
      false,		/* pc_relative */
      0,			/* bitpos */
@@ -405,11 +405,9 @@ extra_case (bfd *in_abfd,
 
     case R_IMM24:
       if (reloc->howto->partial_inplace)
-        val += (bfd_get_16 ( in_abfd, data+*src_ptr)
-            + (bfd_get_8 ( in_abfd, data+*src_ptr+2) << 16))
-            & reloc->howto->src_mask;
-      bfd_put_16 (in_abfd, val, data + *dst_ptr);
-      bfd_put_8 (in_abfd, val >> 16, data + *dst_ptr+2);
+	val += (bfd_get_24 (in_abfd, data + *src_ptr)
+		& reloc->howto->src_mask);
+      bfd_put_24 (in_abfd, val, data + *dst_ptr);
       (*dst_ptr) += 3;
       (*src_ptr) += 3;
       break;