* bucomm.c (list_supported_targets): Use bfd_target_list.

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

diff --git a/bfd/coff-z8k.c b/bfd/coff-z8k.c
index 0eda8ee40cbeaf1b7672e35f9705506c9c5dec14..c1d6a88fbbb5edda26531613c54712006c911a46 100644 (file)
--- a/bfd/coff-z8k.c
+++ b/bfd/coff-z8k.c
@@ -87,8 +87,8 @@ coff_z8k_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';
@@ -185,10 +185,25 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
       break;
 
     case R_IMM32:
-      bfd_put_32 (in_abfd,
-                 /* 0x80000000 indicates a long segmented address.  */
-                 bfd_coff_reloc16_get_value (reloc, link_info, input_section) | 0x80000000,
-                 data + *dst_ptr);
+      /* If no flags are set, assume immediate value.  */
+      if (! (*reloc->sym_ptr_ptr)->section->flags)
+       {
+         bfd_put_32 (in_abfd,
+                     bfd_coff_reloc16_get_value (reloc, link_info,
+                                                 input_section),
+                     data + *dst_ptr);
+       }
+      else
+       {
+         bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+                                                   input_section);
+         /* Adresses are 23 bit, and the layout of those in a 32-bit
+            value is as follows:
+              1AAAAAAA xxxxxxxx AAAAAAAA AAAAAAAA
+            (A - address bits,  x - ignore).  */
+         dst = (dst & 0xffff) | ((dst & 0xff0000) << 8) | 0x80000000;
+         bfd_put_32 (in_abfd, dst, data + *dst_ptr);
+       }
       (*dst_ptr) += 4;
       (*src_ptr) += 4;
       break;
@@ -314,7 +329,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;