]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - bfd/elf32-v850.c
BFD whitespace fixes
[thirdparty/binutils-gdb.git] / bfd / elf32-v850.c
index 3f9954c5ca5cce1b6f67f51d85a599aa8f6770c0..83fec2e4d6b559e59c2685020621245b63b1b0ae 100644 (file)
@@ -91,21 +91,21 @@ v850_elf_check_relocs (bfd *abfd,
        default:
          break;
 
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_V850_GNU_VTINHERIT:
-          if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return FALSE;
-          break;
-
-        /* This relocation describes which C++ vtable entries
+       /* This relocation describes the C++ object vtable hierarchy.
+          Reconstruct it for later use during GC.  */
+       case R_V850_GNU_VTINHERIT:
+         if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
+           return FALSE;
+         break;
+
+       /* This relocation describes which C++ vtable entries
           are actually used.  Record for later use during GC.  */
-        case R_V850_GNU_VTENTRY:
-          BFD_ASSERT (h != NULL);
-          if (h != NULL
-              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return FALSE;
-          break;
+       case R_V850_GNU_VTENTRY:
+         BFD_ASSERT (h != NULL);
+         if (h != NULL
+             && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+           return FALSE;
+         break;
 
        case R_V850_SDA_16_16_SPLIT_OFFSET:
        case R_V850_SDA_16_16_OFFSET:
@@ -215,10 +215,10 @@ v850_elf_check_relocs (bfd *abfd,
 
 typedef struct hi16s_location
 {
-  bfd_vma                 addend;
-  bfd_byte *              address;
-  unsigned long           counter;
-  bfd_boolean             found;
+  bfd_vma                addend;
+  bfd_byte *             address;
+  unsigned long                  counter;
+  bfd_boolean            found;
   struct hi16s_location * next;
 }
 hi16s_location;
@@ -672,7 +672,7 @@ v850_elf_perform_relocation (bfd *abfd,
        return bfd_reloc_overflow;
 
       if (addend & 1)
-        return bfd_reloc_dangerous;
+       return bfd_reloc_dangerous;
 
       insn = (addend &~ (bfd_vma) 1) | (insn & 1);
       break;
@@ -1008,7 +1008,7 @@ static reloc_howto_type v850_elf_howto_table[] =
         0xffff,                        /* Dst_mask.  */
         FALSE),                        /* PCrel_offset.  */
 
-  /* Simple 8bit reloc.         */
+  /* Simple 8bit reloc.  */
   HOWTO (R_V850_8,                     /* Type.  */
         0,                             /* Rightshift.  */
         0,                             /* Size (0 = byte, 1 = short, 2 = long).  */
@@ -1236,79 +1236,79 @@ static reloc_howto_type v850_elf_howto_table[] =
 
   /* GNU extension to record C++ vtable hierarchy */
   HOWTO (R_V850_GNU_VTINHERIT, /* Type.  */
-        0,                     /* Rightshift.  */
-        2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
-        0,                     /* Bitsize.  */
-        FALSE,                 /* PC_relative.  */
-        0,                     /* Bitpos.  */
+        0,                     /* Rightshift.  */
+        2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+        0,                     /* Bitsize.  */
+        FALSE,                 /* PC_relative.  */
+        0,                     /* Bitpos.  */
         complain_overflow_dont, /* Complain_on_overflow.  */
-        NULL,                  /* Special_function.  */
+        NULL,                  /* Special_function.  */
         "R_V850_GNU_VTINHERIT", /* Name.  */
-        FALSE,                 /* Partial_inplace.  */
-        0,                     /* Src_mask.  */
-        0,                     /* Dst_mask.  */
-        FALSE),                /* PCrel_offset.  */
+        FALSE,                 /* Partial_inplace.  */
+        0,                     /* Src_mask.  */
+        0,                     /* Dst_mask.  */
+        FALSE),                /* PCrel_offset.  */
 
   /* GNU extension to record C++ vtable member usage.  */
-  HOWTO (R_V850_GNU_VTENTRY,     /* Type.  */
-        0,                     /* Rightshift.  */
-        2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
-        0,                     /* Bitsize.  */
-        FALSE,                 /* PC_relative.  */
-        0,                     /* Bitpos.  */
+  HOWTO (R_V850_GNU_VTENTRY,    /* Type.  */
+        0,                     /* Rightshift.  */
+        2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+        0,                     /* Bitsize.  */
+        FALSE,                 /* PC_relative.  */
+        0,                     /* Bitpos.  */
         complain_overflow_dont, /* Complain_on_overflow.  */
-        _bfd_elf_rel_vtable_reloc_fn,  /* Special_function.  */
-        "R_V850_GNU_VTENTRY",   /* Name.  */
-        FALSE,                 /* Partial_inplace.  */
-        0,                     /* Src_mask.  */
-        0,                     /* Dst_mask.  */
-        FALSE),                /* PCrel_offset.  */
+        _bfd_elf_rel_vtable_reloc_fn,  /* Special_function.  */
+        "R_V850_GNU_VTENTRY",   /* Name.  */
+        FALSE,                 /* Partial_inplace.  */
+        0,                     /* Src_mask.  */
+        0,                     /* Dst_mask.  */
+        FALSE),                /* PCrel_offset.  */
 
   /* Indicates a .longcall pseudo-op.  The compiler will generate a .longcall
      pseudo-op when it finds a function call which can be relaxed.  */
   HOWTO (R_V850_LONGCALL,     /* Type.  */
-        0,                     /* Rightshift.  */
-        2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
-        32,                    /* Bitsize.  */
-        TRUE,                  /* PC_relative.  */
-        0,                     /* Bitpos.  */
+        0,                     /* Rightshift.  */
+        2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+        32,                    /* Bitsize.  */
+        TRUE,                  /* PC_relative.  */
+        0,                     /* Bitpos.  */
         complain_overflow_signed, /* Complain_on_overflow.  */
         v850_elf_ignore_reloc, /* Special_function.  */
-        "R_V850_LONGCALL",     /* Name.  */
-        FALSE,                 /* Partial_inplace.  */
-        0,                     /* Src_mask.  */
-        0,                     /* Dst_mask.  */
-        TRUE),                 /* PCrel_offset.  */
+        "R_V850_LONGCALL",     /* Name.  */
+        FALSE,                 /* Partial_inplace.  */
+        0,                     /* Src_mask.  */
+        0,                     /* Dst_mask.  */
+        TRUE),                 /* PCrel_offset.  */
 
   /* Indicates a .longjump pseudo-op.  The compiler will generate a
      .longjump pseudo-op when it finds a branch which can be relaxed.  */
   HOWTO (R_V850_LONGJUMP,     /* Type.  */
-        0,                     /* Rightshift.  */
-        2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
-        32,                    /* Bitsize.  */
-        TRUE,                  /* PC_relative.  */
-        0,                     /* Bitpos.  */
+        0,                     /* Rightshift.  */
+        2,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+        32,                    /* Bitsize.  */
+        TRUE,                  /* PC_relative.  */
+        0,                     /* Bitpos.  */
         complain_overflow_signed, /* Complain_on_overflow.  */
         v850_elf_ignore_reloc, /* Special_function.  */
-        "R_V850_LONGJUMP",     /* Name.  */
-        FALSE,                 /* Partial_inplace.  */
-        0,                     /* Src_mask.  */
-        0,                     /* Dst_mask.  */
-        TRUE),                 /* PCrel_offset.  */
-
-  HOWTO (R_V850_ALIGN,        /* Type.  */
-        0,                     /* Rightshift.  */
-        1,                     /* Size (0 = byte, 1 = short, 2 = long).  */
-        0,                     /* Bitsize.  */
-        FALSE,                 /* PC_relative.  */
-        0,                     /* Bitpos.  */
+        "R_V850_LONGJUMP",     /* Name.  */
+        FALSE,                 /* Partial_inplace.  */
+        0,                     /* Src_mask.  */
+        0,                     /* Dst_mask.  */
+        TRUE),                 /* PCrel_offset.  */
+
+  HOWTO (R_V850_ALIGN,       /* Type.  */
+        0,                     /* Rightshift.  */
+        1,                     /* Size (0 = byte, 1 = short, 2 = long).  */
+        0,                     /* Bitsize.  */
+        FALSE,                 /* PC_relative.  */
+        0,                     /* Bitpos.  */
         complain_overflow_unsigned, /* Complain_on_overflow.  */
         v850_elf_ignore_reloc, /* Special_function.  */
-        "R_V850_ALIGN",        /* Name.  */
-        FALSE,                 /* Partial_inplace.  */
-        0,                     /* Src_mask.  */
-        0,                     /* Dst_mask.  */
-        TRUE),                 /* PCrel_offset.  */
+        "R_V850_ALIGN",        /* Name.  */
+        FALSE,                 /* Partial_inplace.  */
+        0,                     /* Src_mask.  */
+        0,                     /* Dst_mask.  */
+        TRUE),                 /* PCrel_offset.  */
 
   /* Simple pc-relative 32bit reloc.  */
   HOWTO (R_V850_REL32,                 /* Type.  */
@@ -1400,7 +1400,7 @@ static reloc_howto_type v850_elf_howto_table[] =
         0xfffffffe,                    /* dst_mask.  */
         TRUE),                         /* pcrel_offset.  */
 
-  /* A absolute 32 bit branch. */
+  /* A absolute 32 bit branch.  */
   HOWTO (R_V850_32_ABS,                        /* type.  */
         1,                             /* rightshift.  */
         2,                             /* size (0 = byte, 1 = short, 2 = long).  */
@@ -1688,58 +1688,58 @@ struct v850_elf_reloc_map
 
 static const struct v850_elf_reloc_map v850_elf_reloc_map[] =
 {
-  { BFD_RELOC_NONE,                        R_V850_NONE                   },
-  { BFD_RELOC_V850_9_PCREL,                R_V850_9_PCREL                },
-  { BFD_RELOC_V850_22_PCREL,               R_V850_22_PCREL               },
-  { BFD_RELOC_HI16_S,                      R_V850_HI16_S                 },
-  { BFD_RELOC_HI16,                        R_V850_HI16                   },
-  { BFD_RELOC_LO16,                        R_V850_LO16                   },
-  { BFD_RELOC_32,                          R_V850_ABS32                  },
-  { BFD_RELOC_32_PCREL,                    R_V850_REL32                  },
-  { BFD_RELOC_16,                          R_V850_16                     },
-  { BFD_RELOC_8,                           R_V850_8                      },
-  { BFD_RELOC_V850_SDA_16_16_OFFSET,       R_V850_SDA_16_16_OFFSET       },
-  { BFD_RELOC_V850_SDA_15_16_OFFSET,       R_V850_SDA_15_16_OFFSET       },
-  { BFD_RELOC_V850_ZDA_16_16_OFFSET,       R_V850_ZDA_16_16_OFFSET       },
-  { BFD_RELOC_V850_ZDA_15_16_OFFSET,       R_V850_ZDA_15_16_OFFSET       },
-  { BFD_RELOC_V850_TDA_6_8_OFFSET,         R_V850_TDA_6_8_OFFSET         },
-  { BFD_RELOC_V850_TDA_7_8_OFFSET,         R_V850_TDA_7_8_OFFSET         },
-  { BFD_RELOC_V850_TDA_7_7_OFFSET,         R_V850_TDA_7_7_OFFSET         },
-  { BFD_RELOC_V850_TDA_16_16_OFFSET,       R_V850_TDA_16_16_OFFSET       },
-  { BFD_RELOC_V850_TDA_4_5_OFFSET,         R_V850_TDA_4_5_OFFSET         },
-  { BFD_RELOC_V850_TDA_4_4_OFFSET,         R_V850_TDA_4_4_OFFSET         },
-  { BFD_RELOC_V850_LO16_SPLIT_OFFSET,      R_V850_LO16_SPLIT_OFFSET      },
+  { BFD_RELOC_NONE,                       R_V850_NONE                   },
+  { BFD_RELOC_V850_9_PCREL,               R_V850_9_PCREL                },
+  { BFD_RELOC_V850_22_PCREL,              R_V850_22_PCREL               },
+  { BFD_RELOC_HI16_S,                     R_V850_HI16_S                 },
+  { BFD_RELOC_HI16,                       R_V850_HI16                   },
+  { BFD_RELOC_LO16,                       R_V850_LO16                   },
+  { BFD_RELOC_32,                         R_V850_ABS32                  },
+  { BFD_RELOC_32_PCREL,                           R_V850_REL32                  },
+  { BFD_RELOC_16,                         R_V850_16                     },
+  { BFD_RELOC_8,                          R_V850_8                      },
+  { BFD_RELOC_V850_SDA_16_16_OFFSET,      R_V850_SDA_16_16_OFFSET       },
+  { BFD_RELOC_V850_SDA_15_16_OFFSET,      R_V850_SDA_15_16_OFFSET       },
+  { BFD_RELOC_V850_ZDA_16_16_OFFSET,      R_V850_ZDA_16_16_OFFSET       },
+  { BFD_RELOC_V850_ZDA_15_16_OFFSET,      R_V850_ZDA_15_16_OFFSET       },
+  { BFD_RELOC_V850_TDA_6_8_OFFSET,        R_V850_TDA_6_8_OFFSET         },
+  { BFD_RELOC_V850_TDA_7_8_OFFSET,        R_V850_TDA_7_8_OFFSET         },
+  { BFD_RELOC_V850_TDA_7_7_OFFSET,        R_V850_TDA_7_7_OFFSET         },
+  { BFD_RELOC_V850_TDA_16_16_OFFSET,      R_V850_TDA_16_16_OFFSET       },
+  { BFD_RELOC_V850_TDA_4_5_OFFSET,        R_V850_TDA_4_5_OFFSET         },
+  { BFD_RELOC_V850_TDA_4_4_OFFSET,        R_V850_TDA_4_4_OFFSET         },
+  { BFD_RELOC_V850_LO16_SPLIT_OFFSET,     R_V850_LO16_SPLIT_OFFSET      },
   { BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET, R_V850_SDA_16_16_SPLIT_OFFSET },
   { BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET, R_V850_ZDA_16_16_SPLIT_OFFSET },
-  { BFD_RELOC_V850_CALLT_6_7_OFFSET,       R_V850_CALLT_6_7_OFFSET       },
-  { BFD_RELOC_V850_CALLT_16_16_OFFSET,     R_V850_CALLT_16_16_OFFSET     },
-  { BFD_RELOC_VTABLE_INHERIT,              R_V850_GNU_VTINHERIT          },
-  { BFD_RELOC_VTABLE_ENTRY,                R_V850_GNU_VTENTRY            },
-  { BFD_RELOC_V850_LONGCALL,               R_V850_LONGCALL               },
-  { BFD_RELOC_V850_LONGJUMP,               R_V850_LONGJUMP               },
-  { BFD_RELOC_V850_ALIGN,                  R_V850_ALIGN                  },
-  { BFD_RELOC_V850_16_PCREL,               R_V850_16_PCREL               },
-  { BFD_RELOC_V850_17_PCREL,               R_V850_17_PCREL               },
-  { BFD_RELOC_V850_23,                     R_V850_23                     },
-  { BFD_RELOC_V850_32_PCREL,               R_V850_32_PCREL               },
-  { BFD_RELOC_V850_32_ABS,                 R_V850_32_ABS                 },
-  { BFD_RELOC_V850_16_SPLIT_OFFSET,        R_V850_HI16                   },
-  { BFD_RELOC_V850_16_S1,                  R_V850_16_S1                  },
-  { BFD_RELOC_V850_LO16_S1,                R_V850_LO16_S1                },
-  { BFD_RELOC_V850_CALLT_15_16_OFFSET,     R_V850_CALLT_15_16_OFFSET     },
-  { BFD_RELOC_V850_32_GOTPCREL,            R_V850_32_GOTPCREL            },
-  { BFD_RELOC_V850_16_GOT,                 R_V850_16_GOT                 },
-  { BFD_RELOC_V850_32_GOT,                 R_V850_32_GOT                 },
-  { BFD_RELOC_V850_22_PLT_PCREL,           R_V850_22_PLT                 },
-  { BFD_RELOC_V850_32_PLT_PCREL,           R_V850_32_PLT                 },
-  { BFD_RELOC_V850_COPY,                   R_V850_COPY                   },
-  { BFD_RELOC_V850_GLOB_DAT,               R_V850_GLOB_DAT               },
-  { BFD_RELOC_V850_JMP_SLOT,               R_V850_JMP_SLOT               },
-  { BFD_RELOC_V850_RELATIVE,               R_V850_RELATIVE               },
-  { BFD_RELOC_V850_16_GOTOFF,              R_V850_16_GOTOFF              },
-  { BFD_RELOC_V850_32_GOTOFF,              R_V850_32_GOTOFF              },
-  { BFD_RELOC_V850_CODE,                   R_V850_CODE                   },
-  { BFD_RELOC_V850_DATA,                   R_V850_DATA                   },
+  { BFD_RELOC_V850_CALLT_6_7_OFFSET,      R_V850_CALLT_6_7_OFFSET       },
+  { BFD_RELOC_V850_CALLT_16_16_OFFSET,    R_V850_CALLT_16_16_OFFSET     },
+  { BFD_RELOC_VTABLE_INHERIT,             R_V850_GNU_VTINHERIT          },
+  { BFD_RELOC_VTABLE_ENTRY,               R_V850_GNU_VTENTRY            },
+  { BFD_RELOC_V850_LONGCALL,              R_V850_LONGCALL               },
+  { BFD_RELOC_V850_LONGJUMP,              R_V850_LONGJUMP               },
+  { BFD_RELOC_V850_ALIGN,                 R_V850_ALIGN                  },
+  { BFD_RELOC_V850_16_PCREL,              R_V850_16_PCREL               },
+  { BFD_RELOC_V850_17_PCREL,              R_V850_17_PCREL               },
+  { BFD_RELOC_V850_23,                    R_V850_23                     },
+  { BFD_RELOC_V850_32_PCREL,              R_V850_32_PCREL               },
+  { BFD_RELOC_V850_32_ABS,                R_V850_32_ABS                 },
+  { BFD_RELOC_V850_16_SPLIT_OFFSET,       R_V850_HI16                   },
+  { BFD_RELOC_V850_16_S1,                 R_V850_16_S1                  },
+  { BFD_RELOC_V850_LO16_S1,               R_V850_LO16_S1                },
+  { BFD_RELOC_V850_CALLT_15_16_OFFSET,    R_V850_CALLT_15_16_OFFSET     },
+  { BFD_RELOC_V850_32_GOTPCREL,                   R_V850_32_GOTPCREL            },
+  { BFD_RELOC_V850_16_GOT,                R_V850_16_GOT                 },
+  { BFD_RELOC_V850_32_GOT,                R_V850_32_GOT                 },
+  { BFD_RELOC_V850_22_PLT_PCREL,          R_V850_22_PLT                 },
+  { BFD_RELOC_V850_32_PLT_PCREL,          R_V850_32_PLT                 },
+  { BFD_RELOC_V850_COPY,                  R_V850_COPY                   },
+  { BFD_RELOC_V850_GLOB_DAT,              R_V850_GLOB_DAT               },
+  { BFD_RELOC_V850_JMP_SLOT,              R_V850_JMP_SLOT               },
+  { BFD_RELOC_V850_RELATIVE,              R_V850_RELATIVE               },
+  { BFD_RELOC_V850_16_GOTOFF,             R_V850_16_GOTOFF              },
+  { BFD_RELOC_V850_32_GOTOFF,             R_V850_32_GOTOFF              },
+  { BFD_RELOC_V850_CODE,                  R_V850_CODE                   },
+  { BFD_RELOC_V850_DATA,                  R_V850_DATA                   },
 };
 
 #define V800_RELOC(name,sz,bit,shift,complain,pcrel,resolver)           \
@@ -2047,7 +2047,7 @@ v850_elf_final_link_relocate (reloc_howto_type *howto,
     case R_V850_SDA_16_16_SPLIT_OFFSET:
     case R_V810_GPWLO_1:
       {
-       unsigned long                gp;
+       unsigned long                gp;
        struct bfd_link_hash_entry * h;
 
        if (sym_sec == NULL)
@@ -2075,7 +2075,7 @@ v850_elf_final_link_relocate (reloc_howto_type *howto,
     case R_V850_TDA_6_8_OFFSET:
     case R_V850_TDA_16_16_OFFSET:
       {
-       unsigned long                ep;
+       unsigned long                ep;
        struct bfd_link_hash_entry * h;
 
        /* Get the value of __ep.  */
@@ -2094,7 +2094,7 @@ v850_elf_final_link_relocate (reloc_howto_type *howto,
 
     case R_V850_CALLT_6_7_OFFSET:
       {
-       unsigned long                ctbp;
+       unsigned long                ctbp;
        struct bfd_link_hash_entry * h;
 
        /* Get the value of __ctbp.  */
@@ -2113,7 +2113,7 @@ v850_elf_final_link_relocate (reloc_howto_type *howto,
     case R_V850_CALLT_15_16_OFFSET:
     case R_V850_CALLT_16_16_OFFSET:
       {
-       unsigned long                ctbp;
+       unsigned long                ctbp;
        struct bfd_link_hash_entry * h;
 
        if (sym_sec == NULL)
@@ -2196,8 +2196,8 @@ v850_elf_relocate_section (bfd *output_bfd,
       r_type   = ELF32_R_TYPE (rel->r_info);
 
       if (r_type == R_V850_GNU_VTENTRY
-          || r_type == R_V850_GNU_VTINHERIT)
-        continue;
+         || r_type == R_V850_GNU_VTINHERIT)
+       continue;
 
       if (bfd_get_arch (input_bfd) == bfd_arch_v850_rh850)
        howto = v800_elf_howto_table + (r_type - R_V810_NONE);
@@ -2820,11 +2820,11 @@ v850_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       && (in_flags & EF_V850_ARCH) != E_V850_ARCH)
     {
       /* Allow earlier architecture binaries to be linked with later binaries.
-         Set the output binary to the later architecture, except for v850e1,
-         which we set to v850e.  */
+        Set the output binary to the later architecture, except for v850e1,
+        which we set to v850e.  */
       if (   (in_flags  & EF_V850_ARCH) == E_V850E1_ARCH
-          && (out_flags & EF_V850_ARCH) == E_V850E_ARCH)
-        return result;
+         && (out_flags & EF_V850_ARCH) == E_V850E_ARCH)
+       return result;
 
       if (   (in_flags  & EF_V850_ARCH) == E_V850_ARCH
          && (out_flags & EF_V850_ARCH) == E_V850E_ARCH)
@@ -2856,7 +2856,7 @@ v850_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
       if ((   (in_flags & EF_V850_ARCH) == E_V850_ARCH
           || (in_flags & EF_V850_ARCH) == E_V850E_ARCH
           || (in_flags & EF_V850_ARCH) == E_V850E2_ARCH
-           || (in_flags & EF_V850_ARCH) == E_V850E2V3_ARCH)
+          || (in_flags & EF_V850_ARCH) == E_V850E2V3_ARCH)
          && (out_flags & EF_V850_ARCH) == E_V850E3V5_ARCH)
        {
          elf_elfheader (obfd)->e_flags =
@@ -2993,15 +2993,15 @@ v850_elf_symbol_processing (bfd *abfd, asymbol *asym)
       if (v850_elf_scom_section.name == NULL)
        {
          /* Initialize the small common section.  */
-         v850_elf_scom_section.name           = ".scommon";
-         v850_elf_scom_section.flags          = SEC_IS_COMMON | SEC_ALLOC | SEC_DATA;
+         v850_elf_scom_section.name           = ".scommon";
+         v850_elf_scom_section.flags          = SEC_IS_COMMON | SEC_ALLOC | SEC_DATA;
          v850_elf_scom_section.output_section = & v850_elf_scom_section;
-         v850_elf_scom_section.symbol         = & v850_elf_scom_symbol;
+         v850_elf_scom_section.symbol         = & v850_elf_scom_symbol;
          v850_elf_scom_section.symbol_ptr_ptr = & v850_elf_scom_symbol_ptr;
-         v850_elf_scom_symbol.name            = ".scommon";
-         v850_elf_scom_symbol.flags           = BSF_SECTION_SYM;
-         v850_elf_scom_symbol.section         = & v850_elf_scom_section;
-         v850_elf_scom_symbol_ptr             = & v850_elf_scom_symbol;
+         v850_elf_scom_symbol.name            = ".scommon";
+         v850_elf_scom_symbol.flags           = BSF_SECTION_SYM;
+         v850_elf_scom_symbol.section         = & v850_elf_scom_section;
+         v850_elf_scom_symbol_ptr             = & v850_elf_scom_symbol;
        }
       asym->section = & v850_elf_scom_section;
       asym->value = elfsym->internal_elf_sym.st_size;
@@ -3011,15 +3011,15 @@ v850_elf_symbol_processing (bfd *abfd, asymbol *asym)
       if (v850_elf_tcom_section.name == NULL)
        {
          /* Initialize the tcommon section.  */
-         v850_elf_tcom_section.name           = ".tcommon";
-         v850_elf_tcom_section.flags          = SEC_IS_COMMON;
+         v850_elf_tcom_section.name           = ".tcommon";
+         v850_elf_tcom_section.flags          = SEC_IS_COMMON;
          v850_elf_tcom_section.output_section = & v850_elf_tcom_section;
-         v850_elf_tcom_section.symbol         = & v850_elf_tcom_symbol;
+         v850_elf_tcom_section.symbol         = & v850_elf_tcom_symbol;
          v850_elf_tcom_section.symbol_ptr_ptr = & v850_elf_tcom_symbol_ptr;
-         v850_elf_tcom_symbol.name            = ".tcommon";
-         v850_elf_tcom_symbol.flags           = BSF_SECTION_SYM;
-         v850_elf_tcom_symbol.section         = & v850_elf_tcom_section;
-         v850_elf_tcom_symbol_ptr             = & v850_elf_tcom_symbol;
+         v850_elf_tcom_symbol.name            = ".tcommon";
+         v850_elf_tcom_symbol.flags           = BSF_SECTION_SYM;
+         v850_elf_tcom_symbol.section         = & v850_elf_tcom_section;
+         v850_elf_tcom_symbol_ptr             = & v850_elf_tcom_symbol;
        }
       asym->section = & v850_elf_tcom_section;
       asym->value = elfsym->internal_elf_sym.st_size;
@@ -3029,15 +3029,15 @@ v850_elf_symbol_processing (bfd *abfd, asymbol *asym)
       if (v850_elf_zcom_section.name == NULL)
        {
          /* Initialize the zcommon section.  */
-         v850_elf_zcom_section.name           = ".zcommon";
-         v850_elf_zcom_section.flags          = SEC_IS_COMMON;
+         v850_elf_zcom_section.name           = ".zcommon";
+         v850_elf_zcom_section.flags          = SEC_IS_COMMON;
          v850_elf_zcom_section.output_section = & v850_elf_zcom_section;
-         v850_elf_zcom_section.symbol         = & v850_elf_zcom_symbol;
+         v850_elf_zcom_section.symbol         = & v850_elf_zcom_symbol;
          v850_elf_zcom_section.symbol_ptr_ptr = & v850_elf_zcom_symbol_ptr;
-         v850_elf_zcom_symbol.name            = ".zcommon";
-         v850_elf_zcom_symbol.flags           = BSF_SECTION_SYM;
-         v850_elf_zcom_symbol.section         = & v850_elf_zcom_section;
-         v850_elf_zcom_symbol_ptr             = & v850_elf_zcom_symbol;
+         v850_elf_zcom_symbol.name            = ".zcommon";
+         v850_elf_zcom_symbol.flags           = BSF_SECTION_SYM;
+         v850_elf_zcom_symbol.section         = & v850_elf_zcom_section;
+         v850_elf_zcom_symbol_ptr             = & v850_elf_zcom_symbol;
        }
       asym->section = & v850_elf_zcom_section;
       asym->value = elfsym->internal_elf_sym.st_size;
@@ -3284,7 +3284,7 @@ v850_elf_relax_delete_bytes (bfd *abfd,
 #if (DEBUG_RELAX & 2)
          {
            char * name = bfd_elf_string_from_elf_section
-                          (abfd, symtab_hdr->sh_link, isym.st_name);
+                          (abfd, symtab_hdr->sh_link, isym.st_name);
            fprintf (stderr,
               "relax_delete: local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x\n",
               sec->name, name, isym.st_name,
@@ -3319,7 +3319,7 @@ v850_elf_relax_delete_bytes (bfd *abfd,
          && (paddr < addr + count || paddr >= toaddr))
        irel->r_addend += count;
       else if (    (symval < addr + count || symval >= toaddr)
-               && (paddr >= addr + count && paddr < toaddr))
+               && (paddr >= addr + count && paddr < toaddr))
        irel->r_addend -= count;
     }
 
@@ -3409,24 +3409,24 @@ v850_elf_relax_delete_bytes (bfd *abfd,
   return TRUE;
 }
 
-#define NOP_OPCODE     (0x0000)
-#define MOVHI          0x0640                          /* 4byte.  */
-#define MOVHI_MASK     0x07e0
+#define NOP_OPCODE     (0x0000)
+#define MOVHI          0x0640                          /* 4byte.  */
+#define MOVHI_MASK     0x07e0
 #define MOVHI_R1(insn) ((insn) & 0x1f)                 /* 4byte.  */
 #define MOVHI_R2(insn) ((insn) >> 11)
-#define MOVEA          0x0620                          /* 2byte.  */
-#define MOVEA_MASK     0x07e0
+#define MOVEA          0x0620                          /* 2byte.  */
+#define MOVEA_MASK     0x07e0
 #define MOVEA_R1(insn) ((insn) & 0x1f)
 #define MOVEA_R2(insn) ((insn) >> 11)
-#define JARL_4         0x00040780                              /* 4byte.  */
-#define JARL_4_MASK    0xFFFF07FF
+#define JARL_4         0x00040780                              /* 4byte.  */
+#define JARL_4_MASK    0xFFFF07FF
 #define JARL_R2(insn)  (int)(((insn) & (~JARL_4_MASK)) >> 11)
-#define ADD_I          0x0240                                  /* 2byte.  */
-#define ADD_I_MASK     0x07e0
+#define ADD_I          0x0240                                  /* 2byte.  */
+#define ADD_I_MASK     0x07e0
 #define ADD_I5(insn)   ((((insn) & 0x001f) << 11) >> 11)       /* 2byte.  */
 #define ADD_R2(insn)   ((insn) >> 11)
-#define JMP_R          0x0060                                  /* 2byte.  */
-#define JMP_R_MASK     0xFFE0
+#define JMP_R          0x0060                                  /* 2byte.  */
+#define JMP_R_MASK     0xFFE0
 #define JMP_R1(insn)   ((insn) & 0x1f)
 
 static bfd_boolean
@@ -3617,8 +3617,8 @@ v850_elf_relax_section (bfd *abfd,
                }
 
              /* Get the reloc for the address from which the register is
-                being loaded.  This reloc will tell us which function is
-                actually being called.  */
+                being loaded.  This reloc will tell us which function is
+                actually being called.  */
 
              for (hi_irelfn = internal_relocs; hi_irelfn < irelend; hi_irelfn ++)
                {
@@ -3764,12 +3764,12 @@ v850_elf_relax_section (bfd *abfd,
                continue;
 
              /* For simplicity of coding, we are going to modify the section
-                contents, the section relocs, and the BFD symbol table.  We
-                must tell the rest of the code not to free up this
-                information.  It would be possible to instead create a table
-                of changes which have to be made, as is done in coff-mips.c;
-                that would be more work, but would require less memory when
-                the linker is run.  */
+                contents, the section relocs, and the BFD symbol table.  We
+                must tell the rest of the code not to free up this
+                information.  It would be possible to instead create a table
+                of changes which have to be made, as is done in coff-mips.c;
+                that would be more work, but would require less memory when
+                the linker is run.  */
              elf_section_data (sec)->relocs = internal_relocs;
              elf_section_data (sec)->this_hdr.contents = contents;
              symtab_hdr->contents = (bfd_byte *) isymbuf;
@@ -3855,8 +3855,8 @@ v850_elf_relax_section (bfd *abfd,
                }
 
              /* Get the reloc for the address from which the register is
-                being loaded.  This reloc will tell us which function is
-                actually being called.  */
+                being loaded.  This reloc will tell us which function is
+                actually being called.  */
              for (hi_irelfn = internal_relocs; hi_irelfn < irelend; hi_irelfn ++)
                {
                  r_type = ELF32_R_TYPE (hi_irelfn->r_info);
@@ -3890,7 +3890,7 @@ v850_elf_relax_section (bfd *abfd,
              if (ELF32_R_SYM (hi_irelfn->r_info) < symtab_hdr->sh_info)
                {
                  Elf_Internal_Sym *  isym;
-                 asection *          sym_sec;
+                 asection *          sym_sec;
 
                  /* A local symbol.  */
                  isym = isymbuf + ELF32_R_SYM (hi_irelfn->r_info);
@@ -3967,12 +3967,12 @@ v850_elf_relax_section (bfd *abfd,
                continue;
 
              /* For simplicity of coding, we are going to modify the section
-                contents, the section relocs, and the BFD symbol table.  We
-                must tell the rest of the code not to free up this
-                information.  It would be possible to instead create a table
-                of changes which have to be made, as is done in coff-mips.c;
-                that would be more work, but would require less memory when
-                the linker is run.  */
+                contents, the section relocs, and the BFD symbol table.  We
+                must tell the rest of the code not to free up this
+                information.  It would be possible to instead create a table
+                of changes which have to be made, as is done in coff-mips.c;
+                that would be more work, but would require less memory when
+                the linker is run.  */
              elf_section_data (sec)->relocs = internal_relocs;
              elf_section_data (sec)->this_hdr.contents = contents;
              symtab_hdr->contents = (bfd_byte *) isymbuf;
@@ -4104,29 +4104,29 @@ static const struct bfd_elf_special_section v850_elf_special_sections[] =
   { STRING_COMMA_LEN (".call_table_data"), 0, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE) },
   { STRING_COMMA_LEN (".call_table_text"), 0, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_EXECINSTR) },
-  { STRING_COMMA_LEN (".rosdata"),        -2, SHT_PROGBITS,     (SHF_ALLOC
+  { STRING_COMMA_LEN (".rosdata"),       -2, SHT_PROGBITS,     (SHF_ALLOC
                                                                 + SHF_V850_GPREL) },
-  { STRING_COMMA_LEN (".rozdata"),        -2, SHT_PROGBITS,     (SHF_ALLOC
+  { STRING_COMMA_LEN (".rozdata"),       -2, SHT_PROGBITS,     (SHF_ALLOC
                                                                 + SHF_V850_R0REL) },
-  { STRING_COMMA_LEN (".sbss"),           -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".sbss"),                  -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_GPREL) },
-  { STRING_COMMA_LEN (".scommon"),        -2, SHT_V850_SCOMMON, (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".scommon"),       -2, SHT_V850_SCOMMON, (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_GPREL) },
-  { STRING_COMMA_LEN (".sdata"),          -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".sdata"),         -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_GPREL) },
-  { STRING_COMMA_LEN (".tbss"),           -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".tbss"),                  -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_EPREL) },
-  { STRING_COMMA_LEN (".tcommon"),        -2, SHT_V850_TCOMMON, (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".tcommon"),       -2, SHT_V850_TCOMMON, (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_R0REL) },
-  { STRING_COMMA_LEN (".tdata"),          -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".tdata"),         -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_EPREL) },
-  { STRING_COMMA_LEN (".zbss"),           -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".zbss"),                  -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_R0REL) },
-  { STRING_COMMA_LEN (".zcommon"),        -2, SHT_V850_ZCOMMON, (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".zcommon"),       -2, SHT_V850_ZCOMMON, (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_R0REL) },
-  { STRING_COMMA_LEN (".zdata"),          -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
+  { STRING_COMMA_LEN (".zdata"),         -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
                                                                 + SHF_V850_R0REL) },
-  { NULL,                     0,           0, 0,                0 }
+  { NULL,                    0,           0, 0,                0 }
 };
 \f
 #define TARGET_LITTLE_SYM                      v850_elf32_vec
@@ -4140,27 +4140,27 @@ static const struct bfd_elf_special_section v850_elf_special_sections[] =
 #define elf_info_to_howto_rel                  v850_elf_info_to_howto_rel
 
 #define elf_backend_check_relocs               v850_elf_check_relocs
-#define elf_backend_relocate_section           v850_elf_relocate_section
+#define elf_backend_relocate_section           v850_elf_relocate_section
 #define elf_backend_object_p                   v850_elf_object_p
-#define elf_backend_final_write_processing     v850_elf_final_write_processing
-#define elf_backend_section_from_bfd_section   v850_elf_section_from_bfd_section
+#define elf_backend_final_write_processing     v850_elf_final_write_processing
+#define elf_backend_section_from_bfd_section   v850_elf_section_from_bfd_section
 #define elf_backend_symbol_processing          v850_elf_symbol_processing
 #define elf_backend_add_symbol_hook            v850_elf_add_symbol_hook
-#define elf_backend_link_output_symbol_hook    v850_elf_link_output_symbol_hook
+#define elf_backend_link_output_symbol_hook    v850_elf_link_output_symbol_hook
 #define elf_backend_section_from_shdr          v850_elf_section_from_shdr
 #define elf_backend_fake_sections              v850_elf_fake_sections
-#define elf_backend_gc_mark_hook                v850_elf_gc_mark_hook
+#define elf_backend_gc_mark_hook               v850_elf_gc_mark_hook
 #define elf_backend_special_sections           v850_elf_special_sections
 
-#define elf_backend_can_gc_sections            1
+#define elf_backend_can_gc_sections            1
 #define elf_backend_rela_normal                        1
 
 #define bfd_elf32_bfd_is_local_label_name      v850_elf_is_local_label_name
 #define bfd_elf32_bfd_is_target_special_symbol v850_elf_is_target_special_symbol
 
 #define bfd_elf32_bfd_reloc_type_lookup                v850_elf_reloc_type_lookup
-#define bfd_elf32_bfd_reloc_name_lookup                v850_elf_reloc_name_lookup
-#define bfd_elf32_bfd_merge_private_bfd_data   v850_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_reloc_name_lookup                v850_elf_reloc_name_lookup
+#define bfd_elf32_bfd_merge_private_bfd_data   v850_elf_merge_private_bfd_data
 #define bfd_elf32_bfd_set_private_flags                v850_elf_set_private_flags
 #define bfd_elf32_bfd_print_private_bfd_data   v850_elf_print_private_bfd_data
 #define bfd_elf32_bfd_relax_section            v850_elf_relax_section
@@ -4176,20 +4176,20 @@ static const struct bfd_elf_special_section v850_elf_special_sections[] =
 
 static const struct v850_elf_reloc_map v800_elf_reloc_map[] =
 {
-  { BFD_RELOC_NONE,                   R_V810_NONE    },
-  { BFD_RELOC_8,                      R_V810_BYTE    },
-  { BFD_RELOC_16,                     R_V810_HWORD   },
-  { BFD_RELOC_32,                     R_V810_WORD    },
-  { BFD_RELOC_LO16,                   R_V810_WLO     },
-  { BFD_RELOC_HI16,                   R_V810_WHI     },
-  { BFD_RELOC_HI16_S,                 R_V810_WHI1    },
-  { BFD_RELOC_V850_32_PCREL,          R_V850_PC32    },
-  { BFD_RELOC_V850_22_PCREL,          R_V850_PCR22   },
-  { BFD_RELOC_V850_17_PCREL,          R_V850_PC17    },
-  { BFD_RELOC_V850_16_PCREL,          R_V850_PC16U   },
+  { BFD_RELOC_NONE,                  R_V810_NONE    },
+  { BFD_RELOC_8,                     R_V810_BYTE    },
+  { BFD_RELOC_16,                    R_V810_HWORD   },
+  { BFD_RELOC_32,                    R_V810_WORD    },
+  { BFD_RELOC_LO16,                  R_V810_WLO     },
+  { BFD_RELOC_HI16,                  R_V810_WHI     },
+  { BFD_RELOC_HI16_S,                R_V810_WHI1    },
+  { BFD_RELOC_V850_32_PCREL,         R_V850_PC32    },
+  { BFD_RELOC_V850_22_PCREL,         R_V850_PCR22   },
+  { BFD_RELOC_V850_17_PCREL,         R_V850_PC17    },
+  { BFD_RELOC_V850_16_PCREL,         R_V850_PC16U   },
   { BFD_RELOC_V850_9_PCREL,          R_V850_PC9     },
-  { BFD_RELOC_V850_LO16_S1,           R_V810_WLO_1   }, /* Or R_V850_HWLO or R_V850_HWLO_1.  */
-  { BFD_RELOC_V850_23,                R_V850_WLO23   },
+  { BFD_RELOC_V850_LO16_S1,          R_V810_WLO_1   }, /* Or R_V850_HWLO or R_V850_HWLO_1.  */
+  { BFD_RELOC_V850_23,               R_V850_WLO23   },
   { BFD_RELOC_V850_LO16_SPLIT_OFFSET, R_V850_BLO     },
   { BFD_RELOC_V850_ZDA_16_16_OFFSET,  R_V810_HWORD   },
   { BFD_RELOC_V850_TDA_16_16_OFFSET,  R_V810_HWORD   },
@@ -4242,8 +4242,8 @@ v800_elf_reloc_name_lookup (bfd * abfd, const char * r_name)
 /* Set the howto pointer in CACHE_PTR for a V800 ELF reloc.  */
 
 static void
-v800_elf_info_to_howto (bfd *               abfd,
-                       arelent *           cache_ptr,
+v800_elf_info_to_howto (bfd *              abfd,
+                       arelent *           cache_ptr,
                        Elf_Internal_Rela * dst)
 {
   unsigned int r_type = ELF32_R_TYPE (dst->r_info);