Touches most files in bfd/, so likely will be blamed for everything..

[deliverable/binutils-gdb.git] / bfd / coff-h8500.c

diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c
index ecbb70ff3f9ee4ee9a80ce99ad8d7d967254fe67..05a84015bff40dd2f289478352de32f705f02540 100644 (file)
--- a/bfd/coff-h8500.c
+++ b/bfd/coff-h8500.c
@@ -86,8 +86,8 @@ coff_h8500_select_reloc (howto)
 #define __A_MAGIC_SET__
 
 /* Code to swap in the reloc.  */
-#define SWAP_IN_RELOC_OFFSET   bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
+#define SWAP_IN_RELOC_OFFSET   H_GET_32
+#define SWAP_OUT_RELOC_OFFSET  H_PUT_32
 #define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
   dst->r_stuff[0] = 'S'; \
   dst->r_stuff[1] = 'C';
@@ -227,7 +227,7 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
        int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
        int o = bfd_get_32 (in_abfd, data+ *dst_ptr -1);
        v = (v & 0x00ffffff) | (o & 0xff00000);
-       bfd_put_32 (in_abfd, v, data  + *dst_ptr -1);
+       bfd_put_32 (in_abfd, (bfd_vma) v, data  + *dst_ptr -1);
        (*dst_ptr) += 3;
        (*src_ptr) += 3;;
       }
@@ -235,7 +235,7 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
     case R_H8500_IMM32:
       {
        int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-       bfd_put_32 (in_abfd, v, data  + *dst_ptr);
+       bfd_put_32 (in_abfd, (bfd_vma) v, data  + *dst_ptr);
        (*dst_ptr) += 4;
        (*src_ptr) += 4;;
       }
@@ -282,7 +282,7 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
                    input_section, reloc->address)))
              abort ();
          }
-       bfd_put_16 (in_abfd, gap, data + *dst_ptr);
+       bfd_put_16 (in_abfd, (bfd_vma) gap, data + *dst_ptr);
        (*dst_ptr) += 2;
        (*src_ptr) += 2;
        break;