This commit was manufactured by cvs2svn to create branch 'binutils-
[external/binutils.git] / bfd / elf32-v850.c
index 98db745..11fbbb4 100644 (file)
@@ -1,12 +1,13 @@
 /* V850-specific support for 32-bit ELF
-   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007, 2008, 2009, 2010, 2011, 2012
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+
 
 /* XXX FIXME: This code is littered with 32bit int, 16bit short, 8bit char
    dependencies.  As is the gas & simulator code for the v850.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/v850.h"
 #include "libiberty.h"
 
-/* Sign-extend a 24-bit number.  */
-#define SEXT24(x)      ((((x) & 0xffffff) ^ 0x800000) - 0x800000)
-
-static reloc_howto_type *v850_elf_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void v850_elf_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static void v850_elf_info_to_howto_rela
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static bfd_reloc_status_type v850_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_boolean v850_elf_is_local_label_name
-  PARAMS ((bfd *, const char *));
-static bfd_boolean v850_elf_relocate_section
-  PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-         Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static bfd_reloc_status_type v850_elf_perform_relocation
-  PARAMS ((bfd *, unsigned int, bfd_vma, bfd_byte *));
-static bfd_boolean v850_elf_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
-static void remember_hi16s_reloc
-  PARAMS ((bfd *, bfd_vma, bfd_byte *));
-static bfd_byte * find_remembered_hi16s_reloc
-  PARAMS ((bfd_vma, bfd_boolean *));
-static bfd_reloc_status_type v850_elf_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *, bfd_vma,
-          bfd_vma, bfd_vma, struct bfd_link_info *, asection *, int));
-static bfd_boolean v850_elf_object_p
-  PARAMS ((bfd *));
-static bfd_boolean v850_elf_fake_sections
-  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
-static void v850_elf_final_write_processing
-  PARAMS ((bfd *, bfd_boolean));
-static bfd_boolean v850_elf_set_private_flags
-  PARAMS ((bfd *, flagword));
-static bfd_boolean v850_elf_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static bfd_boolean v850_elf_print_private_bfd_data
-  PARAMS ((bfd *, PTR));
-static bfd_boolean v850_elf_section_from_bfd_section
-  PARAMS ((bfd *, asection *, int *));
-static void v850_elf_symbol_processing
-  PARAMS ((bfd *, asymbol *));
-static bfd_boolean v850_elf_add_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Sym *,
-          const char **, flagword *, asection **, bfd_vma *));
-static bfd_boolean v850_elf_link_output_symbol_hook
-  PARAMS ((struct bfd_link_info *, const char *, Elf_Internal_Sym *,
-          asection *, struct elf_link_hash_entry *));
-static bfd_boolean v850_elf_gc_sweep_hook
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-          const Elf_Internal_Rela *));
-static asection * v850_elf_gc_mark_hook
-  PARAMS ((asection *, struct bfd_link_info *,
-          Elf_Internal_Rela *, struct elf_link_hash_entry *,
-          Elf_Internal_Sym *));
-static bfd_reloc_status_type v850_elf_ignore_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_boolean v850_elf_relax_delete_bytes
-  PARAMS ((bfd *, asection *, bfd_vma, bfd_vma, int));
-static bfd_boolean v850_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, bfd_boolean *));
-
-/* Note: It is REQUIRED that the 'type' value of each entry
-   in this array match the index of the entry in the array.  */
-static reloc_howto_type v850_elf_howto_table[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_V850_NONE,                  /* type */
-        0,                             /* rightshift */
-        2,                             /* size (0 = byte, 1 = short, 2 = long) */
-        32,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_bitfield,    /* complain_on_overflow */
-        bfd_elf_generic_reloc,         /* special_function */
-        "R_V850_NONE",                 /* name */
-        FALSE,                         /* partial_inplace */
-        0,                             /* src_mask */
-        0,                             /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* A PC relative 9 bit branch.  */
-  HOWTO (R_V850_9_PCREL,               /* type */
-        2,                             /* rightshift */
-        2,                             /* size (0 = byte, 1 = short, 2 = long) */
-        26,                            /* bitsize */
-        TRUE,                          /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_bitfield,    /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_9_PCREL",              /* name */
-        FALSE,                         /* partial_inplace */
-        0x00ffffff,                    /* src_mask */
-        0x00ffffff,                    /* dst_mask */
-        TRUE),                         /* pcrel_offset */
+/* Sign-extend a 17-bit number.  */
+#define SEXT17(x)      ((((x) & 0x1ffff) ^ 0x10000) - 0x10000)
 
-  /* A PC relative 22 bit branch.  */
-  HOWTO (R_V850_22_PCREL,              /* type */
-        2,                             /* rightshift */
-        2,                             /* size (0 = byte, 1 = short, 2 = long) */
-        22,                            /* bitsize */
-        TRUE,                          /* pc_relative */
-        7,                             /* bitpos */
-        complain_overflow_signed,      /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_22_PCREL",             /* name */
-        FALSE,                         /* partial_inplace */
-        0x07ffff80,                    /* src_mask */
-        0x07ffff80,                    /* dst_mask */
-        TRUE),                         /* pcrel_offset */
+/* Sign-extend a 22-bit number.  */
+#define SEXT22(x)      ((((x) & 0x3fffff) ^ 0x200000) - 0x200000)
 
-  /* High 16 bits of symbol value.  */
-  HOWTO (R_V850_HI16_S,                        /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_HI16_S",               /* name */
-        FALSE,                         /* partial_inplace */
-        0xffff,                        /* src_mask */
-        0xffff,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
+static reloc_howto_type v850_elf_howto_table[];
 
-  /* High 16 bits of symbol value.  */
-  HOWTO (R_V850_HI16,                  /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_HI16",                 /* name */
-        FALSE,                         /* partial_inplace */
-        0xffff,                        /* src_mask */
-        0xffff,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* Low 16 bits of symbol value.  */
-  HOWTO (R_V850_LO16,                  /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_LO16",                 /* name */
-        FALSE,                         /* partial_inplace */
-        0xffff,                        /* src_mask */
-        0xffff,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* Simple 32bit reloc.  */
-  HOWTO (R_V850_ABS32,                 /* type */
-        0,                             /* rightshift */
-        2,                             /* size (0 = byte, 1 = short, 2 = long) */
-        32,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_ABS32",                /* name */
-        FALSE,                         /* partial_inplace */
-        0xffffffff,                    /* src_mask */
-        0xffffffff,                    /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* Simple 16bit reloc.  */
-  HOWTO (R_V850_16,                    /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        bfd_elf_generic_reloc,         /* special_function */
-        "R_V850_16",                   /* name */
-        FALSE,                         /* partial_inplace */
-        0xffff,                        /* src_mask */
-        0xffff,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* Simple 8bit reloc.         */
-  HOWTO (R_V850_8,                     /* type */
-        0,                             /* rightshift */
-        0,                             /* size (0 = byte, 1 = short, 2 = long) */
-        8,                             /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        bfd_elf_generic_reloc,         /* special_function */
-        "R_V850_8",                    /* name */
-        FALSE,                         /* partial_inplace */
-        0xff,                          /* src_mask */
-        0xff,                          /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 16 bit offset from the short data area pointer.  */
-  HOWTO (R_V850_SDA_16_16_OFFSET,      /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_SDA_16_16_OFFSET",     /* name */
-        FALSE,                         /* partial_inplace */
-        0xffff,                        /* src_mask */
-        0xffff,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 15 bit offset from the short data area pointer.  */
-  HOWTO (R_V850_SDA_15_16_OFFSET,      /* type */
-        1,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        1,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_SDA_15_16_OFFSET",     /* name */
-        FALSE,                         /* partial_inplace */
-        0xfffe,                        /* src_mask */
-        0xfffe,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 16 bit offset from the zero data area pointer.  */
-  HOWTO (R_V850_ZDA_16_16_OFFSET,      /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_ZDA_16_16_OFFSET",     /* name */
-        FALSE,                         /* partial_inplace */
-        0xffff,                        /* src_mask */
-        0xffff,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 15 bit offset from the zero data area pointer.  */
-  HOWTO (R_V850_ZDA_15_16_OFFSET,      /* type */
-        1,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        1,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_ZDA_15_16_OFFSET",     /* name */
-        FALSE,                         /* partial_inplace */
-        0xfffe,                        /* src_mask */
-        0xfffe,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 6 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_6_8_OFFSET,                /* type */
-        2,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        8,                             /* bitsize */
-        FALSE,                         /* pc_relative */
-        1,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_TDA_6_8_OFFSET",       /* name */
-        FALSE,                         /* partial_inplace */
-        0x7e,                          /* src_mask */
-        0x7e,                          /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 8 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_7_8_OFFSET,                /* type */
-        1,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        8,                             /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_TDA_7_8_OFFSET",       /* name */
-        FALSE,                         /* partial_inplace */
-        0x7f,                          /* src_mask */
-        0x7f,                          /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 7 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_7_7_OFFSET,                /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        7,                             /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_TDA_7_7_OFFSET",       /* name */
-        FALSE,                         /* partial_inplace */
-        0x7f,                          /* src_mask */
-        0x7f,                          /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 16 bit offset from the tiny data area pointer!  */
-  HOWTO (R_V850_TDA_16_16_OFFSET,      /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_TDA_16_16_OFFSET",     /* name */
-        FALSE,                         /* partial_inplace */
-        0xffff,                        /* src_mask */
-        0xfff,                         /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 5 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_4_5_OFFSET,                /* type */
-        1,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        5,                             /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_TDA_4_5_OFFSET",       /* name */
-        FALSE,                         /* partial_inplace */
-        0x0f,                          /* src_mask */
-        0x0f,                          /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 4 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_4_4_OFFSET,                /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        4,                             /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_TDA_4_4_OFFSET",       /* name */
-        FALSE,                         /* partial_inplace */
-        0x0f,                          /* src_mask */
-        0x0f,                          /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 16 bit offset from the short data area pointer.  */
-  HOWTO (R_V850_SDA_16_16_SPLIT_OFFSET,        /* type */
-        0,                             /* rightshift */
-        2,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_SDA_16_16_SPLIT_OFFSET",/* name */
-        FALSE,                         /* partial_inplace */
-        0xfffe0020,                    /* src_mask */
-        0xfffe0020,                    /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 16 bit offset from the zero data area pointer.  */
-  HOWTO (R_V850_ZDA_16_16_SPLIT_OFFSET,        /* type */
-        0,                             /* rightshift */
-        2,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_ZDA_16_16_SPLIT_OFFSET",/* name */
-        FALSE,                         /* partial_inplace */
-        0xfffe0020,                    /* src_mask */
-        0xfffe0020,                    /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 6 bit offset from the call table base pointer.  */
-  HOWTO (R_V850_CALLT_6_7_OFFSET,      /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        7,                             /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_CALLT_6_7_OFFSET",     /* name */
-        FALSE,                         /* partial_inplace */
-        0x3f,                          /* src_mask */
-        0x3f,                          /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 16 bit offset from the call table base pointer.  */
-  HOWTO (R_V850_CALLT_16_16_OFFSET,    /* type */
-        0,                             /* rightshift */
-        1,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_CALLT_16_16_OFFSET",   /* name */
-        FALSE,                         /* partial_inplace */
-        0xffff,                        /* src_mask */
-        0xffff,                        /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* 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 */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_V850_GNU_VTINHERIT", /* name */
-         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 */
-         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 */
-
-  /* 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 */
-       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 */
-
-  /* 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 */
-       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 */
-       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 */
-  
-  /* Simple pc-relative 32bit reloc.  */
-  HOWTO (R_V850_REL32,                 /* type */
-        0,                             /* rightshift */
-        2,                             /* size (0 = byte, 1 = short, 2 = long) */
-        32,                            /* bitsize */
-        TRUE,                          /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_REL32",                /* name */
-        FALSE,                         /* partial_inplace */
-        0xffffffff,                    /* src_mask */
-        0xffffffff,                    /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-
-  /* An ld.bu version of R_V850_LO16.  */
-  HOWTO (R_V850_LO16_SPLIT_OFFSET,     /* type */
-        0,                             /* rightshift */
-        2,                             /* size (0 = byte, 1 = short, 2 = long) */
-        16,                            /* bitsize */
-        FALSE,                         /* pc_relative */
-        0,                             /* bitpos */
-        complain_overflow_dont,        /* complain_on_overflow */
-        v850_elf_reloc,                /* special_function */
-        "R_V850_LO16_SPLIT_OFFSET",    /* name */
-        FALSE,                         /* partial_inplace */
-        0xfffe0020,                    /* src_mask */
-        0xfffe0020,                    /* dst_mask */
-        FALSE),                        /* pcrel_offset */
-};
-
-/* Map BFD reloc types to V850 ELF reloc types.  */
-
-struct v850_elf_reloc_map
-{
-  /* BFD_RELOC_V850_CALLT_16_16_OFFSET is 258, which will not fix in an
-     unsigned char.  */
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned int elf_reloc_val;
-};
-
-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_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                  },
-
-};
-\f
-/* Map a bfd relocation into the appropriate howto structure.  */
-
-static reloc_howto_type *
-v850_elf_reloc_type_lookup (abfd, code)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = ARRAY_SIZE (v850_elf_reloc_map); i --;)
-    if (v850_elf_reloc_map[i].bfd_reloc_val == code)
-      {
-       unsigned int elf_reloc_val = v850_elf_reloc_map[i].elf_reloc_val;
-
-       BFD_ASSERT (v850_elf_howto_table[elf_reloc_val].type == elf_reloc_val);
-
-       return v850_elf_howto_table + elf_reloc_val;
-      }
-
-  return NULL;
-}
-\f
-/* Set the howto pointer for an V850 ELF reloc.  */
-
-static void
-v850_elf_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *cache_ptr;
-     Elf_Internal_Rela *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_V850_max);
-  cache_ptr->howto = &v850_elf_howto_table[r_type];
-}
-
-/* Set the howto pointer for a V850 ELF reloc (type RELA).  */
-static void
-v850_elf_info_to_howto_rela (abfd, cache_ptr, dst)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent * cache_ptr;
-     Elf_Internal_Rela *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_V850_max);
-  cache_ptr->howto = &v850_elf_howto_table[r_type];
-}
-\f
 /* Look through the relocs for a section during the first phase, and
    allocate space in the global offset table or procedure linkage
    table.  */
 
 static bfd_boolean
-v850_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
+v850_elf_check_relocs (bfd *abfd,
+                      struct bfd_link_info *info,
+                      asection *sec,
+                      const Elf_Internal_Rela *relocs)
 {
   bfd_boolean ret = TRUE;
-  bfd *dynobj;
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   const Elf_Internal_Rela *rel;
   const Elf_Internal_Rela *rel_end;
-  asection *sreloc;
   enum v850_reloc_type r_type;
   int other = 0;
-  const char *common = (const char *)0;
+  const char *common = NULL;
 
   if (info->relocatable)
     return TRUE;
@@ -674,10 +67,8 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
                      sec, abfd);
 #endif
 
-  dynobj = elf_hash_table (info)->dynobj;
   symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (abfd);
-  sreloc = NULL;
 
   rel_end = relocs + sec->reloc_count;
   for (rel = relocs; rel < rel_end; rel++)
@@ -689,7 +80,12 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
       if (r_symndx < symtab_hdr->sh_info)
        h = NULL;
       else
-       h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+       {
+         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+         while (h->root.type == bfd_link_hash_indirect
+                || h->root.type == bfd_link_hash_warning)
+           h = (struct elf_link_hash_entry *) h->root.u.i.link;
+       }
 
       r_type = (enum v850_reloc_type) ELF32_R_TYPE (rel->r_info);
       switch (r_type)
@@ -697,16 +93,25 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
        default:
        case R_V850_NONE:
        case R_V850_9_PCREL:
+       case R_V850_16_PCREL:
+       case R_V850_17_PCREL:
        case R_V850_22_PCREL:
-       case R_V850_HI16_S:
+       case R_V850_32_PCREL:
+       case R_V850_32_ABS:
        case R_V850_HI16:
+       case R_V850_HI16_S:
        case R_V850_LO16:
+       case R_V850_LO16_S1:
        case R_V850_LO16_SPLIT_OFFSET:
+       case R_V850_23:
        case R_V850_ABS32:
        case R_V850_REL32:
        case R_V850_16:
+       case R_V850_16_S1:
+       case R_V850_16_SPLIT_OFFSET:
        case R_V850_8:
        case R_V850_CALLT_6_7_OFFSET:
+       case R_V850_CALLT_15_16_OFFSET:
        case R_V850_CALLT_16_16_OFFSET:
          break;
 
@@ -720,7 +125,9 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
         /* This relocation describes which C++ vtable entries
           are actually used.  Record for later use during GC.  */
         case R_V850_GNU_VTENTRY:
-          if (!bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
+          BFD_ASSERT (h != NULL);
+          if (h != NULL
+              && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend))
             return FALSE;
           break;
 
@@ -738,11 +145,11 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
          common = ".zcommon";
          goto small_data_common;
 
-       case R_V850_TDA_4_5_OFFSET:
        case R_V850_TDA_4_4_OFFSET:
+       case R_V850_TDA_4_5_OFFSET:
+       case R_V850_TDA_7_7_OFFSET:
        case R_V850_TDA_6_8_OFFSET:
        case R_V850_TDA_7_8_OFFSET:
-       case R_V850_TDA_7_7_OFFSET:
        case R_V850_TDA_16_16_OFFSET:
          other = V850_OTHER_TDA;
          common = ".tcommon";
@@ -829,30 +236,27 @@ v850_elf_check_relocs (abfd, info, sec, relocs)
 
 typedef struct hi16s_location
 {
-  bfd_vma addend;
-  bfd_byte *address;
-  unsigned long counter;
-  bfd_boolean found;
-  struct hi16s_location *next;
+  bfd_vma                 addend;
+  bfd_byte *              address;
+  unsigned long           counter;
+  bfd_boolean             found;
+  struct hi16s_location * next;
 }
 hi16s_location;
 
-static hi16s_location *previous_hi16s;
-static hi16s_location *free_hi16s;
-static unsigned long hi16s_counter;
+static hi16s_location * previous_hi16s;
+static hi16s_location * free_hi16s;
+static unsigned long    hi16s_counter;
 
 static void
-remember_hi16s_reloc (abfd, addend, address)
-     bfd *abfd;
-     bfd_vma addend;
-     bfd_byte *address;
+remember_hi16s_reloc (bfd *abfd, bfd_vma addend, bfd_byte *address)
 {
   hi16s_location * entry = NULL;
   bfd_size_type amt = sizeof (* free_hi16s);
 
   /* Find a free structure.  */
   if (free_hi16s == NULL)
-    free_hi16s = (hi16s_location *) bfd_zalloc (abfd, amt);
+    free_hi16s = bfd_zalloc (abfd, amt);
 
   entry      = free_hi16s;
   free_hi16s = free_hi16s->next;
@@ -867,25 +271,19 @@ remember_hi16s_reloc (abfd, addend, address)
   /* Cope with wrap around of our counter.  */
   if (hi16s_counter == 0)
     {
-      /* XXX - Assume that all counter entries differ only in their low 16 bits.  */
+      /* XXX: Assume that all counter entries differ only in their low 16 bits.  */
       for (entry = previous_hi16s; entry != NULL; entry = entry->next)
        entry->counter &= 0xffff;
 
       hi16s_counter = 0x10000;
     }
-
-  return;
 }
 
 static bfd_byte *
-find_remembered_hi16s_reloc (addend, already_found)
-     bfd_vma addend;
-     bfd_boolean *already_found;
+find_remembered_hi16s_reloc (bfd_vma addend, bfd_boolean *already_found)
 {
   hi16s_location *match = NULL;
   hi16s_location *entry;
-  hi16s_location *previous = NULL;
-  hi16s_location *prev;
   bfd_byte *addr;
 
   /* Search the table.  Record the most recent entry that matches.  */
@@ -894,11 +292,8 @@ find_remembered_hi16s_reloc (addend, already_found)
       if (entry->addend == addend
          && (match == NULL || match->counter < entry->counter))
        {
-         previous = prev;
          match    = entry;
        }
-
-      prev = entry;
     }
 
   if (match == NULL)
@@ -933,15 +328,15 @@ find_remembered_hi16s_reloc (addend, already_found)
    will store 0 in the value fields for the MOVHI and MOVEA instructions
    and addend will be the address of fred, but for these instructions:
 
-       movhi hi( fred + 0x123456), r0, r1
-       movea lo( fred + 0x123456), r1, r1
+       movhi hi( fred + 0x123456 ), r0, r1
+       movea lo( fred + 0x123456 ), r1, r1
 
    the value stored in the MOVHI instruction will be 0x12 and the value
    stored in the MOVEA instruction will be 0x3456.  If however the
    instructions were:
 
-       movhi hi( fred + 0x10ffff), r0, r1
-       movea lo( fred + 0x10ffff), r1, r1
+       movhi hi( fred + 0x10ffff ), r0, r1
+       movea lo( fred + 0x10ffff ), r1, r1
 
    then the value stored in the MOVHI instruction would be 0x11 (not
    0x10) and the value stored in the MOVEA instruction would be 0xffff.
@@ -950,8 +345,8 @@ find_remembered_hi16s_reloc (addend, already_found)
    adds 0xffffffff (sign extension!) producing 0x10ffff.  Similarly if
    the instructions were:
 
-       movhi hi( fred - 1), r0, r1
-       movea lo( fred - 1), r1, r1
+       movhi hi( fred - 1 ), r0, r1
+       movea lo( fred - 1 ), r1, r1
 
    then 0 is stored in the MOVHI instruction and -1 is stored in the
    MOVEA instruction.
@@ -963,8 +358,8 @@ find_remembered_hi16s_reloc (addend, already_found)
    clear, the assembler will not have added 1 to the previous HI16S reloc
    to compensate for this effect.  For example:
 
-      movhi hi( fred + 0x123456), r0, r1
-      movea lo( fred + 0x123456), r1, r1
+      movhi hi( fred + 0x123456 ), r0, r1
+      movea lo( fred + 0x123456 ), r1, r1
 
    The value stored in HI16S reloc is 0x12, the value stored in the LO16
    reloc is 0x3456.  If we assume that the address of fred is 0x00007000
@@ -984,8 +379,8 @@ find_remembered_hi16s_reloc (addend, already_found)
    Note that if the 15th bit was set in the value stored in the LO16
    reloc, then we do not have to do anything:
 
-      movhi hi( fred + 0x10ffff), r0, r1
-      movea lo( fred + 0x10ffff), r1, r1
+      movhi hi( fred + 0x10ffff ), r0, r1
+      movea lo( fred + 0x10ffff ), r1, r1
 
       HI16S:  0x0011 + (0x00007000 >> 16)    = 0x11
       LO16:   0xffff + (0x00007000 & 0xffff) = 0x6fff
@@ -1005,8 +400,8 @@ find_remembered_hi16s_reloc (addend, already_found)
 
    So, for example if fred is at address 0xf000:
 
-     movhi hi( fred + 0xffff), r0, r1    [bit 15 of the offset is set]
-     movea lo( fred + 0xffff), r1, r1
+     movhi hi( fred + 0xffff ), r0, r1    [bit 15 of the offset is set]
+     movea lo( fred + 0xffff ), r1, r1
 
      HI16S: 0x0001 + (0x0000f000 >> 16)    = 0x0001
      LO16:  0xffff + (0x0000f000 & 0xffff) = 0xefff   (carry into bit 16 is lost)
@@ -1019,8 +414,8 @@ find_remembered_hi16s_reloc (addend, already_found)
    Similarly, if the 15th bit remains clear, but overflow occurs into
    the 16th bit then (assuming the address of fred is 0xf000):
 
-     movhi hi( fred + 0x7000), r0, r1    [bit 15 of the offset is clear]
-     movea lo( fred + 0x7000), r1, r1
+     movhi hi( fred + 0x7000 ), r0, r1    [bit 15 of the offset is clear]
+     movea lo( fred + 0x7000 ), r1, r1
 
      HI16S: 0x0000 + (0x0000f000 >> 16)    = 0x0000
      LO16:  0x7000 + (0x0000f000 & 0xffff) = 0x6fff  (carry into bit 16 is lost)
@@ -1034,8 +429,8 @@ find_remembered_hi16s_reloc (addend, already_found)
    15th bit changes its value from being set to being clear, as the HI16S
    reloc will have already added in 1 to the high part for us:
 
-     movhi hi( fred + 0xffff), r0, r1     [bit 15 of the offset is set]
-     movea lo( fred + 0xffff), r1, r1
+     movhi hi( fred + 0xffff ), r0, r1     [bit 15 of the offset is set]
+     movea lo( fred + 0xffff ), r1, r1
 
      HI16S: 0x0001 + (0x00007000 >> 16)
      LO16:  0xffff + (0x00007000 & 0xffff) = 0x6fff  (carry into bit 16 is lost)
@@ -1048,8 +443,8 @@ find_remembered_hi16s_reloc (addend, already_found)
    but if the 15th bit goes from being clear to being set, then we must
    once again handle overflow:
 
-     movhi hi( fred + 0x7000), r0, r1     [bit 15 of the offset is clear]
-     movea lo( fred + 0x7000), r1, r1
+     movhi hi( fred + 0x7000 ), r0, r1     [bit 15 of the offset is clear]
+     movea lo( fred + 0x7000 ), r1, r1
 
      HI16S: 0x0000 + (0x0000ffff >> 16)
      LO16:  0x7000 + (0x0000ffff & 0xffff) = 0x6fff  (carry into bit 16)
@@ -1065,6 +460,7 @@ v850_elf_perform_lo16_relocation (bfd *abfd, unsigned long *insn,
 {
 #define BIT15_SET(x) ((x) & 0x8000)
 #define OVERFLOWS(a,i) ((((a) & 0xffff) + (i)) > 0xffff)
+
   if ((BIT15_SET (*insn + addend) && ! BIT15_SET (addend))
       || (OVERFLOWS (addend, *insn)
          && ((! BIT15_SET (*insn)) || (BIT15_SET (addend)))))
@@ -1085,7 +481,7 @@ v850_elf_perform_lo16_relocation (bfd *abfd, unsigned long *insn,
        }
       else
        {
-         fprintf (stderr, _("FAILED to find previous HI16 reloc\n"));
+         (*_bfd_error_handler) (_("FAILED to find previous HI16 reloc"));
          return FALSE;
        }
     }
@@ -1102,11 +498,10 @@ v850_elf_perform_lo16_relocation (bfd *abfd, unsigned long *insn,
    allowed to do its stuff instead.  At least for most of the relocs, anyway.  */
 
 static bfd_reloc_status_type
-v850_elf_perform_relocation (abfd, r_type, addend, address)
-     bfd *abfd;
-     unsigned int r_type;
-     bfd_vma addend;
-     bfd_byte *address;
+v850_elf_perform_relocation (bfd *abfd,
+                            unsigned int r_type,
+                            bfd_vma addend,
+                            bfd_byte *address)
 {
   unsigned long insn;
   unsigned long result;
@@ -1115,7 +510,6 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
   switch (r_type)
     {
     default:
-      /* fprintf (stderr, "reloc type %d not SUPPORTED\n", r_type ); */
       return bfd_reloc_notsupported;
 
     case R_V850_REL32:
@@ -1123,6 +517,13 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
       bfd_put_32 (abfd, addend, address);
       return bfd_reloc_ok;
 
+    case R_V850_23:
+      insn  = bfd_get_32 (abfd, address);
+      insn &= ~((0x7f << 4) | (0x7fff80 << (16-7)));
+      insn |= ((addend & 0x7f) << 4) | ((addend & 0x7fff80) << (16-7));
+      bfd_put_32 (abfd, (bfd_vma) insn, address);
+      return bfd_reloc_ok;
+
     case R_V850_22_PCREL:
       if (saddend > 0x1fffff || saddend < -0x200000)
        return bfd_reloc_overflow;
@@ -1136,6 +537,30 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
       bfd_put_32 (abfd, (bfd_vma) insn, address);
       return bfd_reloc_ok;
 
+    case R_V850_17_PCREL:
+      if (saddend > 0xffff || saddend < -0x10000)
+       return bfd_reloc_overflow;
+
+      if ((addend % 2) != 0)
+       return bfd_reloc_dangerous;
+
+      insn  = bfd_get_32 (abfd, address);
+      insn &= ~ 0xfffe0010;
+      insn |= ((addend & 0xfffe) << 16) | ((addend & 0x10000) >> (16-4));
+      break;
+
+    case R_V850_16_PCREL:
+      if ((saddend < -0xffff) || (saddend > 0))
+       return bfd_reloc_overflow;
+
+      if ((addend % 2) != 0)
+       return bfd_reloc_dangerous;
+
+      insn  = bfd_get_16 (abfd, address);
+      insn &= ~0xfffe;
+      insn |= (-addend & 0xfffe);
+      break;
+
     case R_V850_9_PCREL:
       if (saddend > 0xff || saddend < -0x100)
        return bfd_reloc_overflow;
@@ -1162,7 +587,7 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
       addend = (addend >> 16) + ((addend & 0x8000) != 0);
 
       /* This relocation cannot overflow.  */
-      if (addend > 0x7fff)
+      if (addend > 0xffff)
        addend = 0;
 
       insn = addend;
@@ -1196,9 +621,37 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
       insn = addend;
       break;
 
-    case R_V850_16:
+    case R_V850_CALLT_15_16_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+
+      addend += insn & 0xfffe;;
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0xffff || saddend < 0)
+       return bfd_reloc_overflow;
+
+      insn = (0xfffe & addend)
+       | (insn & ~0xfffe);
+      break;
+
+    case R_V850_CALLT_6_7_OFFSET:
+      insn = bfd_get_16 (abfd, address);
+      addend += ((insn & 0x3f) << 1);
+
+      saddend = (bfd_signed_vma) addend;
+
+      if (saddend > 0x7e || saddend < 0)
+       return bfd_reloc_overflow;
 
-      /* drop through */
+      if (addend & 1)
+       return bfd_reloc_dangerous;
+
+      insn &= 0xff80;
+      insn |= (addend >> 1);
+      break;
+
+    case R_V850_16:
     case R_V850_SDA_16_16_OFFSET:
     case R_V850_ZDA_16_16_OFFSET:
     case R_V850_TDA_16_16_OFFSET:
@@ -1212,6 +665,7 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
       insn = addend;
       break;
 
+    case R_V850_16_S1:
     case R_V850_SDA_15_16_OFFSET:
     case R_V850_ZDA_15_16_OFFSET:
       insn = bfd_get_16 (abfd, address);
@@ -1302,6 +756,18 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
       insn |= addend;
       break;
 
+    case R_V850_LO16_S1:
+      insn = bfd_get_16 (abfd, address);
+      result = insn & 0xfffe;
+      if (! v850_elf_perform_lo16_relocation (abfd, &result, addend))
+       return bfd_reloc_overflow;
+      if (result & 1)
+       return bfd_reloc_overflow;
+      insn = (result & 0xfffe)
+       | (insn & ~0xfffe);
+       bfd_put_16 (abfd, insn, address);
+      return bfd_reloc_ok;
+
     case R_V850_LO16_SPLIT_OFFSET:
       insn = bfd_get_32 (abfd, address);
       result = ((insn & 0xfffe0000) >> 16) | ((insn & 0x20) >> 5);
@@ -1313,8 +779,9 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
       bfd_put_32 (abfd, insn, address);
       return bfd_reloc_ok;
 
-    case R_V850_ZDA_16_16_SPLIT_OFFSET:
+    case R_V850_16_SPLIT_OFFSET:
     case R_V850_SDA_16_16_SPLIT_OFFSET:
+    case R_V850_ZDA_16_16_SPLIT_OFFSET:
       insn = bfd_get_32 (abfd, address);
       addend += ((insn & 0xfffe0000) >> 16) + ((insn & 0x20) >> 5);
 
@@ -1330,22 +797,6 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
       bfd_put_32 (abfd, (bfd_vma) insn, address);
       return bfd_reloc_ok;
 
-    case R_V850_CALLT_6_7_OFFSET:
-      insn = bfd_get_16 (abfd, address);
-      addend += ((insn & 0x3f) << 1);
-
-      saddend = (bfd_signed_vma) addend;
-
-      if (saddend > 0x7e || saddend < 0)
-       return bfd_reloc_overflow;
-
-      if (addend & 1)
-       return bfd_reloc_dangerous;
-
-      insn &= 0xff80;
-      insn |= (addend >> 1);
-      break;
-
     case R_V850_GNU_VTINHERIT:
     case R_V850_GNU_VTENTRY:
       return bfd_reloc_ok;
@@ -1359,14 +810,13 @@ v850_elf_perform_relocation (abfd, r_type, addend, address)
 /* Insert the addend into the instruction.  */
 
 static bfd_reloc_status_type
-v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *reloc;
-     asymbol *symbol;
-     PTR data ATTRIBUTE_UNUSED;
-     asection *isection;
-     bfd *obfd;
-     char **err ATTRIBUTE_UNUSED;
+v850_elf_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+               arelent *reloc,
+               asymbol *symbol,
+               void * data ATTRIBUTE_UNUSED,
+               asection *isection,
+               bfd *obfd,
+               char **err ATTRIBUTE_UNUSED)
 {
   long relocation;
 
@@ -1375,7 +825,7 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
      and either we are not putting the addend into the instruction
       or the addend is zero, so there is nothing to add into the instruction
      then just fixup the address and return.  */
-  if (obfd != (bfd *) NULL
+  if (obfd != NULL
       && (symbol->flags & BSF_SECTION_SYM) == 0
       && (! reloc->howto->partial_inplace
          || reloc->addend == 0))
@@ -1421,26 +871,945 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
    for relaxing, which the linker should otherwise ignore.  */
 
 static bfd_reloc_status_type
-v850_elf_ignore_reloc (abfd, reloc_entry, symbol, data, input_section,
-                       output_bfd, error_message)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *reloc_entry;
-     asymbol *symbol ATTRIBUTE_UNUSED;
-     PTR data ATTRIBUTE_UNUSED;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+v850_elf_ignore_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+                      arelent *reloc_entry,
+                      asymbol *symbol ATTRIBUTE_UNUSED,
+                      void * data ATTRIBUTE_UNUSED,
+                      asection *input_section,
+                      bfd *output_bfd,
+                      char **error_message ATTRIBUTE_UNUSED)
 {
   if (output_bfd != NULL)
     reloc_entry->address += input_section->output_offset;
 
   return bfd_reloc_ok;
 }
+/* Note: It is REQUIRED that the 'type' value of each entry
+   in this array match the index of the entry in the array.
+   SeeAlso: RELOC_NUBMER in include/elf/v850.h  */
+static reloc_howto_type v850_elf_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_V850_NONE,                  /* Type.  */
+        0,                             /* Rightshift.  */
+        2,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_bitfield,    /* Complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* Special_function.  */
+        "R_V850_NONE",                 /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0,                             /* Src_mask.  */
+        0,                             /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* A PC relative 9 bit branch.  */
+  HOWTO (R_V850_9_PCREL,               /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        9,                             /* Bitsize.  */
+        TRUE,                          /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_bitfield,    /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_9_PCREL",              /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x00ffffff,                    /* Src_mask.  */
+        0x00ffffff,                    /* Dst_mask.  */
+        TRUE),                         /* PCrel_offset.  */
+
+  /* A PC relative 22 bit branch.  */
+  HOWTO (R_V850_22_PCREL,              /* Type.  */
+        0,                             /* Rightshift.  */
+        2,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        22,                            /* Bitsize.  */
+        TRUE,                          /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_signed,      /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_22_PCREL",             /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x07ffff80,                    /* Src_mask.  */
+        0x07ffff80,                    /* Dst_mask.  */
+        TRUE),                         /* PCrel_offset.  */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_V850_HI16_S,                        /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_HI16_S",               /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xffff,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_V850_HI16,                  /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_HI16",                 /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xffff,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_V850_LO16,                  /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_LO16",                 /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xffff,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* Simple 32bit reloc.  */
+  HOWTO (R_V850_ABS32,                 /* Type.  */
+        0,                             /* Rightshift.  */
+        2,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_ABS32",                /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffffffff,                    /* Src_mask.  */
+        0xffffffff,                    /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* Simple 16bit reloc.  */
+  HOWTO (R_V850_16,                    /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* Special_function.  */
+        "R_V850_16",                   /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xffff,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* Simple 8bit reloc.         */
+  HOWTO (R_V850_8,                     /* Type.  */
+        0,                             /* Rightshift.  */
+        0,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        8,                             /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* Special_function.  */
+        "R_V850_8",                    /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xff,                          /* Src_mask.  */
+        0xff,                          /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 16 bit offset from the short data area pointer.  */
+  HOWTO (R_V850_SDA_16_16_OFFSET,      /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_SDA_16_16_OFFSET",     /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xffff,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 15 bit offset from the short data area pointer.  */
+  HOWTO (R_V850_SDA_15_16_OFFSET,      /* Type.  */
+        1,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        1,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_SDA_15_16_OFFSET",     /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xfffe,                        /* Src_mask.  */
+        0xfffe,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 16 bit offset from the zero data area pointer.  */
+  HOWTO (R_V850_ZDA_16_16_OFFSET,      /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_ZDA_16_16_OFFSET",     /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xffff,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 15 bit offset from the zero data area pointer.  */
+  HOWTO (R_V850_ZDA_15_16_OFFSET,      /* Type.  */
+        1,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        1,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_ZDA_15_16_OFFSET",     /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xfffe,                        /* Src_mask.  */
+        0xfffe,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 6 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_6_8_OFFSET,                /* Type.  */
+        2,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        8,                             /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        1,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_TDA_6_8_OFFSET",       /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x7e,                          /* Src_mask.  */
+        0x7e,                          /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 8 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_7_8_OFFSET,                /* Type.  */
+        1,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        8,                             /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_TDA_7_8_OFFSET",       /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x7f,                          /* Src_mask.  */
+        0x7f,                          /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 7 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_7_7_OFFSET,                /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        7,                             /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_TDA_7_7_OFFSET",       /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x7f,                          /* Src_mask.  */
+        0x7f,                          /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 16 bit offset from the tiny data area pointer!  */
+  HOWTO (R_V850_TDA_16_16_OFFSET,      /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_TDA_16_16_OFFSET",     /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xfff,                         /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 5 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_4_5_OFFSET,                /* Type.  */
+        1,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        5,                             /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_TDA_4_5_OFFSET",       /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x0f,                          /* Src_mask.  */
+        0x0f,                          /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 4 bit offset from the tiny data area pointer.  */
+  HOWTO (R_V850_TDA_4_4_OFFSET,                /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        4,                             /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_TDA_4_4_OFFSET",       /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x0f,                          /* Src_mask.  */
+        0x0f,                          /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 16 bit offset from the short data area pointer.  */
+  HOWTO (R_V850_SDA_16_16_SPLIT_OFFSET,        /* Type.  */
+        0,                             /* Rightshift.  */
+        2,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_SDA_16_16_SPLIT_OFFSET",/* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xfffe0020,                    /* Src_mask.  */
+        0xfffe0020,                    /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 16 bit offset from the zero data area pointer.  */
+  HOWTO (R_V850_ZDA_16_16_SPLIT_OFFSET,        /* Type.  */
+        0,                             /* Rightshift.  */
+        2,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_ZDA_16_16_SPLIT_OFFSET",/* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xfffe0020,                    /* Src_mask.  */
+        0xfffe0020,                    /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 6 bit offset from the call table base pointer.  */
+  HOWTO (R_V850_CALLT_6_7_OFFSET,      /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        7,                             /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_CALLT_6_7_OFFSET",     /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x3f,                          /* Src_mask.  */
+        0x3f,                          /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* 16 bit offset from the call table base pointer.  */
+  HOWTO (R_V850_CALLT_16_16_OFFSET,    /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_CALLT_16_16_OFFSET",   /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xffff,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+
+  /* 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.  */
+        complain_overflow_dont, /* Complain_on_overflow.  */
+        NULL,                  /* Special_function.  */
+        "R_V850_GNU_VTINHERIT", /* Name.  */
+        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.  */
+        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.  */
+
+  /* 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.  */
+        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.  */
+
+  /* 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.  */
+        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.  */
+        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.  */
+
+  /* Simple pc-relative 32bit reloc.  */
+  HOWTO (R_V850_REL32,                 /* Type.  */
+        0,                             /* Rightshift.  */
+        2,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* Bitsize.  */
+        TRUE,                          /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_REL32",                /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffffffff,                    /* Src_mask.  */
+        0xffffffff,                    /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* An ld.bu version of R_V850_LO16.  */
+  HOWTO (R_V850_LO16_SPLIT_OFFSET,     /* Type.  */
+        0,                             /* Rightshift.  */
+        2,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_LO16_SPLIT_OFFSET",    /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xfffe0020,                    /* Src_mask.  */
+        0xfffe0020,                    /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* A unsigned PC relative 16 bit loop.  */
+  HOWTO (R_V850_16_PCREL,              /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        TRUE,                          /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_bitfield,    /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_16_PCREL",             /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xfffe,                        /* Src_mask.  */
+        0xfffe,                        /* Dst_mask.  */
+        TRUE),                         /* PCrel_offset.  */
+
+  /* A PC relative 17 bit branch.  */
+  HOWTO (R_V850_17_PCREL,              /* Type.  */
+        0,                             /* Rightshift.  */
+        2,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        17,                            /* Bitsize.  */
+        TRUE,                          /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_bitfield,    /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_17_PCREL",             /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0x0010fffe,                    /* Src_mask.  */
+        0x0010fffe,                    /* Dst_mask.  */
+        TRUE),                         /* PCrel_offset.  */
+
+  /* A 23bit offset ld/st.  */
+  HOWTO (R_V850_23,                    /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        23,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_dont,        /* complain_on_overflow.  */
+        v850_elf_reloc,                /* special_function.  */
+        "R_V850_23",                   /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffff07f0,                    /* src_mask.  */
+        0xffff07f0,                    /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* A PC relative 32 bit branch.  */
+  HOWTO (R_V850_32_PCREL,              /* type.  */
+        1,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* bitsize.  */
+        TRUE,                          /* pc_relative.  */
+        1,                             /* bitpos.  */
+        complain_overflow_signed,      /* complain_on_overflow.  */
+        v850_elf_reloc,                /* special_function.  */
+        "R_V850_32_PCREL",             /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xfffffffe,                    /* src_mask.  */
+        0xfffffffe,                    /* dst_mask.  */
+        TRUE),                         /* pcrel_offset.  */
+
+  /* A absolute 32 bit branch. */
+  HOWTO (R_V850_32_ABS,                        /* type.  */
+        1,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* bitsize.  */
+        TRUE,                          /* pc_relative.  */
+        1,                             /* bitpos.  */
+        complain_overflow_signed,      /* complain_on_overflow.  */
+        v850_elf_reloc,                /* special_function.  */
+        "R_V850_32_ABS",               /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xfffffffe,                    /* src_mask.  */
+        0xfffffffe,                    /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* High 16 bits of symbol value.  */
+  HOWTO (R_V850_HI16,                  /* Type.  */
+        0,                             /* Rightshift.  */
+        1,                             /* Size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* Bitsize.  */
+        FALSE,                         /* PC_relative.  */
+        0,                             /* Bitpos.  */
+        complain_overflow_dont,        /* Complain_on_overflow.  */
+        v850_elf_reloc,                /* Special_function.  */
+        "R_V850_HI16",                 /* Name.  */
+        FALSE,                         /* Partial_inplace.  */
+        0xffff,                        /* Src_mask.  */
+        0xffff,                        /* Dst_mask.  */
+        FALSE),                        /* PCrel_offset.  */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_V850_16_S1,                 /* type.  */
+        1,                             /* rightshift.  */
+        1,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        1,                             /* bitpos.  */
+        complain_overflow_dont,        /* complain_on_overflow.  */
+        v850_elf_reloc,                /* special_function.  */
+        "R_V850_16_S1",                /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xfffe,                        /* src_mask.  */
+        0xfffe,                        /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* Low 16 bits of symbol value.  */
+  HOWTO (R_V850_LO16_S1,               /* type.  */
+        1,                             /* rightshift.  */
+        1,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        1,                             /* bitpos.  */
+        complain_overflow_dont,        /* complain_on_overflow.  */
+        v850_elf_reloc,                /* special_function.  */
+        "R_V850_LO16_S1",              /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xfffe,                        /* src_mask.  */
+        0xfffe,                        /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* 16 bit offset from the call table base pointer.  */
+  HOWTO (R_V850_CALLT_15_16_OFFSET,    /* type.  */
+        1,                             /* rightshift.  */
+        1,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        1,                             /* bitpos.  */
+        complain_overflow_dont,        /* complain_on_overflow.  */
+        v850_elf_reloc,                /* special_function.  */
+        "R_V850_CALLT_15_16_OFFSET",   /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xfffe,                        /* src_mask.  */
+        0xfffe,                        /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* Like R_V850_32 PCREL, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_V850_32_GOTPCREL,           /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* bitsize.  */
+        TRUE,                          /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_unsigned,    /* complain_on_overflow.  */
+        v850_elf_reloc,                /* special_function.  */
+        "R_V850_32_GOTPCREL",          /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffffffff,                    /* src_mask.  */
+        0xffffffff,                    /* dst_mask.  */
+        TRUE),                         /* pcrel_offset.  */
+
+  /* Like R_V850_SDA_, but referring to the GOT table entry for
+     the symbol.  */
+  HOWTO (R_V850_16_GOT,                        /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        16,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_unsigned,    /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_16_GOT",               /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffff,                        /* src_mask.  */
+        0xffff,                        /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  HOWTO (R_V850_32_GOT,                        /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_unsigned,    /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_32_GOT",               /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffffffff,                    /* src_mask.  */
+        0xffffffff,                    /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* Like R_V850_22_PCREL, but referring to the procedure linkage table
+     entry for the symbol.  */
+  HOWTO (R_V850_22_PLT,                        /* type.  */
+        1,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        22,                            /* bitsize.  */
+        TRUE,                          /* pc_relative.  */
+        7,                             /* bitpos.  */
+        complain_overflow_signed,      /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_22_PLT",               /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0x07ffff80,                    /* src_mask.  */
+        0x07ffff80,                    /* dst_mask.  */
+        TRUE),                         /* pcrel_offset.  */
+
+  HOWTO (R_V850_32_PLT,                        /* type.  */
+        1,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* bitsize.  */
+        TRUE,                          /* pc_relative.  */
+        1,                             /* bitpos.  */
+        complain_overflow_signed,      /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_32_PLT",               /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffffffff,                    /* src_mask.  */
+        0xffffffff,                    /* dst_mask.  */
+        TRUE),                         /* pcrel_offset.  */
+
+  /* This is used only by the dynamic linker.  The symbol should exist
+     both in the object being run and in some shared library.  The
+     dynamic linker copies the data addressed by the symbol from the
+     shared library into the object, because the object being
+     run has to have the data at some particular address.  */
+  HOWTO (R_V850_COPY,                  /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long).  */
+        32,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_bitfield,    /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_COPY",                 /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffffffff,                    /* src_mask.  */
+        0xffffffff,                    /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* Like R_M32R_24, but used when setting global offset table
+     entries.  */
+  HOWTO (R_V850_GLOB_DAT,              /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long) */
+        32,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_bitfield,    /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_GLOB_DAT",             /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffffffff,                    /* src_mask.  */
+        0xffffffff,                    /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* Marks a procedure linkage table entry for a symbol.  */
+  HOWTO (R_V850_JMP_SLOT,              /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long) */
+        32,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_bitfield,    /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_JMP_SLOT",             /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffffffff,                    /* src_mask.  */
+        0xffffffff,                    /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  /* Used only by the dynamic linker.  When the object is run, this
+     longword is set to the load address of the object, plus the
+     addend.  */
+  HOWTO (R_V850_RELATIVE,              /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long) */
+        32,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_bitfield,    /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_RELATIVE",             /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffffffff,                    /* src_mask.  */
+        0xffffffff,                    /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  HOWTO (R_V850_16_GOTOFF,             /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long) */
+        16,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_bitfield,    /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_16_GOTOFF",            /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffff,                        /* src_mask.  */
+        0xffff,                        /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  HOWTO (R_V850_32_GOTOFF,             /* type.  */
+        0,                             /* rightshift.  */
+        2,                             /* size (0 = byte, 1 = short, 2 = long) */
+        32,                            /* bitsize.  */
+        FALSE,                         /* pc_relative.  */
+        0,                             /* bitpos.  */
+        complain_overflow_bitfield,    /* complain_on_overflow.  */
+        bfd_elf_generic_reloc,         /* special_function.  */
+        "R_V850_32_GOTOFF",            /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0xffffffff,                    /* src_mask.  */
+        0xffffffff,                    /* dst_mask.  */
+        FALSE),                        /* pcrel_offset.  */
+
+  HOWTO (R_V850_CODE,                  /* 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_CODE",                 /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0,                             /* src_mask.  */
+        0,                             /* dst_mask.  */
+        TRUE),                         /* pcrel_offset.  */
+
+  HOWTO (R_V850_DATA,                  /* 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_DATA",                 /* name.  */
+        FALSE,                         /* partial_inplace.  */
+        0,                             /* src_mask.  */
+        0,                             /* dst_mask.  */
+        TRUE),                         /* pcrel_offset.  */
+
+};
+
+/* Map BFD reloc types to V850 ELF reloc types.  */
+
+struct v850_elf_reloc_map
+{
+  /* BFD_RELOC_V850_CALLT_16_16_OFFSET is 258, which will not fix in an
+     unsigned char.  */
+  bfd_reloc_code_real_type bfd_reloc_val;
+  unsigned int elf_reloc_val;
+};
+
+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_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                   },
+};
+\f
+/* Map a bfd relocation into the appropriate howto structure.  */
+
+static reloc_howto_type *
+v850_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           bfd_reloc_code_real_type code)
+{
+  unsigned int i;
+
+  for (i = ARRAY_SIZE (v850_elf_reloc_map); i --;)
+    if (v850_elf_reloc_map[i].bfd_reloc_val == code)
+      {
+       unsigned int elf_reloc_val = v850_elf_reloc_map[i].elf_reloc_val;
+
+       BFD_ASSERT (v850_elf_howto_table[elf_reloc_val].type == elf_reloc_val);
+
+       return v850_elf_howto_table + elf_reloc_val;
+      }
+
+  return NULL;
+}
+
+static reloc_howto_type *
+v850_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (v850_elf_howto_table) / sizeof (v850_elf_howto_table[0]);
+       i++)
+    if (v850_elf_howto_table[i].name != NULL
+       && strcasecmp (v850_elf_howto_table[i].name, r_name) == 0)
+      return &v850_elf_howto_table[i];
+
+  return NULL;
+}
+\f
+/* Set the howto pointer for an V850 ELF reloc.  */
+
+static void
+v850_elf_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+                           arelent *cache_ptr,
+                           Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_V850_max);
+  cache_ptr->howto = &v850_elf_howto_table[r_type];
+}
+
+/* Set the howto pointer for a V850 ELF reloc (type RELA).  */
+
+static void
+v850_elf_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+                            arelent * cache_ptr,
+                            Elf_Internal_Rela *dst)
+{
+  unsigned int r_type;
+
+  r_type = ELF32_R_TYPE (dst->r_info);
+  BFD_ASSERT (r_type < (unsigned int) R_V850_max);
+  cache_ptr->howto = &v850_elf_howto_table[r_type];
+}
 \f
 static bfd_boolean
-v850_elf_is_local_label_name (abfd, name)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     const char *name;
+v850_elf_is_local_label_name (bfd *abfd ATTRIBUTE_UNUSED, const char *name)
 {
   return (   (name[0] == '.' && (name[1] == 'L' || name[1] == '.'))
          || (name[0] == '_' &&  name[1] == '.' && name[2] == 'L' && name[3] == '_'));
@@ -1454,20 +1823,17 @@ v850_elf_is_local_label_name (abfd, name)
 /* Perform a relocation as part of a final link.  */
 
 static bfd_reloc_status_type
-v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
-                             input_section, contents, offset, value,
-                             addend, info, sym_sec, is_local)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd *output_bfd ATTRIBUTE_UNUSED;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma offset;
-     bfd_vma value;
-     bfd_vma addend;
-     struct bfd_link_info *info;
-     asection *sym_sec;
-     int is_local ATTRIBUTE_UNUSED;
+v850_elf_final_link_relocate (reloc_howto_type *howto,
+                             bfd *input_bfd,
+                             bfd *output_bfd ATTRIBUTE_UNUSED,
+                             asection *input_section,
+                             bfd_byte *contents,
+                             bfd_vma offset,
+                             bfd_vma value,
+                             bfd_vma addend,
+                             struct bfd_link_info *info,
+                             asection *sym_sec,
+                             int is_local ATTRIBUTE_UNUSED)
 {
   unsigned int r_type = howto->type;
   bfd_byte *hit_data = contents + offset;
@@ -1481,28 +1847,54 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       value -= offset;
       break;
 
+    case R_V850_16_PCREL:
+      value -= (input_section->output_section->vma
+               + input_section->output_offset
+               + offset);
+
+      /* If the sign extension will corrupt the value then we have overflowed.  */
+      if ((value & 0xffff0000) != 0xffff0000)
+       return bfd_reloc_overflow;
+
+      break;
+
+    case R_V850_17_PCREL:
+      value -= (input_section->output_section->vma
+               + input_section->output_offset
+               + offset);
+
+      /* If the sign extension will corrupt the value then we have overflowed.  */
+      if (((value & 0xffff0000) != 0x0) && ((value & 0xffff0000) != 0xffff0000))
+       return bfd_reloc_overflow;
+
+      value = SEXT17 (value);
+      break;
+
     case R_V850_22_PCREL:
       value -= (input_section->output_section->vma
                + input_section->output_offset
                + offset);
 
       /* If the sign extension will corrupt the value then we have overflowed.  */
-      if (((value & 0xff000000) != 0x0) && ((value & 0xff000000) != 0xff000000))
+      if (((value & 0xffe00000) != 0x0) && ((value & 0xffe00000) != 0xffe00000))
        return bfd_reloc_overflow;
 
-      /* Only the bottom 24 bits of the PC are valid */
-      value = SEXT24 (value);
+      /* Only the bottom 22 bits of the PC are valid.  */
+      value = SEXT22 (value);
       break;
 
-    case R_V850_REL32:
+    case R_V850_32_PCREL:
       value -= (input_section->output_section->vma
                + input_section->output_offset
                + offset);
       break;
 
+    case R_V850_32_ABS:
+    case R_V850_23:
     case R_V850_HI16_S:
     case R_V850_HI16:
     case R_V850_LO16:
+    case R_V850_LO16_S1:
     case R_V850_LO16_SPLIT_OFFSET:
     case R_V850_16:
     case R_V850_ABS32:
@@ -1530,7 +1922,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 
        /* Get the value of __gp.  */
        h = bfd_link_hash_lookup (info->hash, "__gp", FALSE, FALSE, TRUE);
-       if (h == (struct bfd_link_hash_entry *) NULL
+       if (h == NULL
            || h->type != bfd_link_hash_defined)
          return bfd_reloc_gp_not_found;
 
@@ -1545,17 +1937,17 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 
     case R_V850_TDA_4_4_OFFSET:
     case R_V850_TDA_4_5_OFFSET:
-    case R_V850_TDA_16_16_OFFSET:
     case R_V850_TDA_7_7_OFFSET:
     case R_V850_TDA_7_8_OFFSET:
     case R_V850_TDA_6_8_OFFSET:
+    case R_V850_TDA_16_16_OFFSET:
       {
        unsigned long                ep;
        struct bfd_link_hash_entry * h;
 
        /* Get the value of __ep.  */
        h = bfd_link_hash_lookup (info->hash, "__ep", FALSE, FALSE, TRUE);
-       if (h == (struct bfd_link_hash_entry *) NULL
+       if (h == NULL
            || h->type != bfd_link_hash_defined)
          return bfd_reloc_ep_not_found;
 
@@ -1574,7 +1966,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 
        /* Get the value of __ctbp.  */
        h = bfd_link_hash_lookup (info->hash, "__ctbp", FALSE, FALSE, TRUE);
-       if (h == (struct bfd_link_hash_entry *) NULL
+       if (h == NULL
            || h->type != bfd_link_hash_defined)
          return bfd_reloc_ctbp_not_found;
 
@@ -1585,6 +1977,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
       }
     break;
 
+    case R_V850_CALLT_15_16_OFFSET:
     case R_V850_CALLT_16_16_OFFSET:
       {
        unsigned long                ctbp;
@@ -1595,7 +1988,7 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 
        /* Get the value of __ctbp.  */
        h = bfd_link_hash_lookup (info->hash, "__ctbp", FALSE, FALSE, TRUE);
-       if (h == (struct bfd_link_hash_entry *) NULL
+       if (h == NULL
            || h->type != bfd_link_hash_defined)
          return bfd_reloc_ctbp_not_found;
 
@@ -1627,25 +2020,20 @@ v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
 /* Relocate an V850 ELF section.  */
 
 static bfd_boolean
-v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-                          contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
+v850_elf_relocate_section (bfd *output_bfd,
+                          struct bfd_link_info *info,
+                          bfd *input_bfd,
+                          asection *input_section,
+                          bfd_byte *contents,
+                          Elf_Internal_Rela *relocs,
+                          Elf_Internal_Sym *local_syms,
+                          asection **local_sections)
 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
   Elf_Internal_Rela *rel;
   Elf_Internal_Rela *relend;
 
-  if (info->relocatable)
-    return TRUE;
-
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
 
@@ -1674,7 +2062,6 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
           || r_type == R_V850_GNU_VTINHERIT)
         continue;
 
-      /* This is a final link.  */
       howto = v850_elf_howto_table + r_type;
       h = NULL;
       sym = NULL;
@@ -1689,9 +2076,9 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
        {
          bfd_boolean unresolved_reloc, warned;
 
-         /* Note - this check is delayed until now as it is possible and valid
-            to have a file without any symbols but with relocs that can be
-            processed.  */
+         /* Note - this check is delayed until now as it is possible and
+            valid to have a file without any symbols but with relocs that
+            can be processed.  */
          if (sym_hashes == NULL)
            {
              info->callbacks->warning
@@ -1707,6 +2094,13 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
                                   unresolved_reloc, warned);
        }
 
+      if (sec != NULL && discarded_section (sec))
+       RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+                                        rel, 1, relend, howto, 0, contents);
+
+      if (info->relocatable)
+       continue;
+
       /* FIXME: We should use the addend, but the COFF relocations don't.  */
       r = v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
                                        input_section,
@@ -1717,7 +2111,7 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
       if (r != bfd_reloc_ok)
        {
          const char * name;
-         const char * msg = (const char *)0;
+         const char * msg = NULL;
 
          if (h != NULL)
            name = h->root.root.string;
@@ -1729,7 +2123,7 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
                name = bfd_section_name (input_bfd, sec);
            }
 
-         switch (r)
+         switch ((int) r)
            {
            case bfd_reloc_overflow:
              if (! ((*info->callbacks->reloc_overflow)
@@ -1787,59 +2181,28 @@ v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   return TRUE;
 }
 
-static bfd_boolean
-v850_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     asection *sec ATTRIBUTE_UNUSED;
-     const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
-{
-  /* No got and plt entries for v850-elf.  */
-  return TRUE;
-}
-
 static asection *
-v850_elf_gc_mark_hook (sec, info, rel, h, sym)
-       asection *sec;
-       struct bfd_link_info *info ATTRIBUTE_UNUSED;
-       Elf_Internal_Rela *rel;
-       struct elf_link_hash_entry *h;
-       Elf_Internal_Sym *sym;
+v850_elf_gc_mark_hook (asection *sec,
+                      struct bfd_link_info *info,
+                      Elf_Internal_Rela *rel,
+                      struct elf_link_hash_entry *h,
+                      Elf_Internal_Sym *sym)
 {
   if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
+    switch (ELF32_R_TYPE (rel->r_info))
       {
       case R_V850_GNU_VTINHERIT:
       case R_V850_GNU_VTENTRY:
-        break;
-
-      default:
-        switch (h->root.type)
-          {
-          case bfd_link_hash_defined:
-          case bfd_link_hash_defweak:
-            return h->root.u.def.section;
-
-          case bfd_link_hash_common:
-            return h->root.u.c.p->section;
-
-         default:
-           break;
-          }
-       }
-     }
-   else
-     return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
+       return NULL;
+      }
 
-  return NULL;
+  return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
 }
 
 /* Set the right machine number.  */
 
 static bfd_boolean
-v850_elf_object_p (abfd)
-     bfd *abfd;
+v850_elf_object_p (bfd *abfd)
 {
   switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH)
     {
@@ -1853,6 +2216,12 @@ v850_elf_object_p (abfd)
     case E_V850E1_ARCH:
       bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e1);
       break;
+    case E_V850E2_ARCH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e2);
+      break;
+    case E_V850E2V3_ARCH:
+      bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e2v3);
+      break;
     }
   return TRUE;
 }
@@ -1860,18 +2229,19 @@ v850_elf_object_p (abfd)
 /* Store the machine number in the flags field.  */
 
 static void
-v850_elf_final_write_processing (abfd, linker)
-     bfd *abfd;
-     bfd_boolean linker ATTRIBUTE_UNUSED;
+v850_elf_final_write_processing (bfd *abfd,
+                                bfd_boolean linker ATTRIBUTE_UNUSED)
 {
   unsigned long val;
 
   switch (bfd_get_mach (abfd))
     {
     default:
-    case bfd_mach_v850:  val = E_V850_ARCH; break;
-    case bfd_mach_v850e: val = E_V850E_ARCH; break;
-    case bfd_mach_v850e1: val = E_V850E1_ARCH;  break;
+    case bfd_mach_v850:   val = E_V850_ARCH; break;
+    case bfd_mach_v850e:  val = E_V850E_ARCH; break;
+    case bfd_mach_v850e1: val = E_V850E1_ARCH; break;
+    case bfd_mach_v850e2: val = E_V850E2_ARCH;  break;
+    case bfd_mach_v850e2v3: val = E_V850E2V3_ARCH;  break;
     }
 
   elf_elfheader (abfd)->e_flags &=~ EF_V850_ARCH;
@@ -1881,9 +2251,7 @@ v850_elf_final_write_processing (abfd, linker)
 /* Function to keep V850 specific file flags.  */
 
 static bfd_boolean
-v850_elf_set_private_flags (abfd, flags)
-     bfd *abfd;
-     flagword flags;
+v850_elf_set_private_flags (bfd *abfd, flagword flags)
 {
   BFD_ASSERT (!elf_flags_init (abfd)
              || elf_elfheader (abfd)->e_flags == flags);
@@ -1895,10 +2263,9 @@ v850_elf_set_private_flags (abfd, flags)
 
 /* Merge backend specific data from an object file
    to the output object file when linking.  */
+
 static bfd_boolean
-v850_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
+v850_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
 {
   flagword out_flags;
   flagword in_flags;
@@ -1938,20 +2305,40 @@ v850_elf_merge_private_bfd_data (ibfd, obfd)
   if ((in_flags & EF_V850_ARCH) != (out_flags & EF_V850_ARCH)
       && (in_flags & EF_V850_ARCH) != E_V850_ARCH)
     {
+
       /* Allow v850e1 binaries to be linked with v850e binaries.
-        Set the output binary to v850e.  */
+         Set the output binary to v850e.  */
       if ((in_flags & EF_V850_ARCH) == E_V850E1_ARCH
-         && (out_flags & EF_V850_ARCH) == E_V850E_ARCH)
-       return TRUE;
+          && (out_flags & EF_V850_ARCH) == E_V850E_ARCH)
+        return TRUE;
 
-      if ((in_flags & EF_V850_ARCH) == E_V850E_ARCH
-         && (out_flags & EF_V850_ARCH) == E_V850E1_ARCH)
+      if ((in_flags & EF_V850_ARCH) == E_V850_ARCH
+         && (out_flags & EF_V850_ARCH) == E_V850E_ARCH)
        {
          elf_elfheader (obfd)->e_flags =
            ((out_flags & ~ EF_V850_ARCH) | E_V850E_ARCH);
          return TRUE;
        }
 
+      if (((in_flags & EF_V850_ARCH) == E_V850_ARCH
+          || (in_flags & EF_V850_ARCH) == E_V850E_ARCH)
+         && (out_flags & EF_V850_ARCH) == E_V850E2_ARCH)
+       {
+         elf_elfheader (obfd)->e_flags =
+           ((out_flags & ~ EF_V850_ARCH) | E_V850E2_ARCH);
+         return TRUE;
+       }
+
+      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)
+         && (out_flags & EF_V850_ARCH) == E_V850E2V3_ARCH)
+       {
+         elf_elfheader (obfd)->e_flags =
+           ((out_flags & ~ EF_V850_ARCH) | E_V850E2V3_ARCH);
+         return TRUE;
+       }
+
       _bfd_error_handler (_("%B: Architecture mismatch with previous modules"),
                          ibfd);
     }
@@ -1962,9 +2349,7 @@ v850_elf_merge_private_bfd_data (ibfd, obfd)
 /* Display the flags field.  */
 
 static bfd_boolean
-v850_elf_print_private_bfd_data (abfd, ptr)
-     bfd *abfd;
-     PTR ptr;
+v850_elf_print_private_bfd_data (bfd *abfd, void * ptr)
 {
   FILE * file = (FILE *) ptr;
 
@@ -1972,15 +2357,17 @@ v850_elf_print_private_bfd_data (abfd, ptr)
 
   _bfd_elf_print_private_bfd_data (abfd, ptr);
 
-  /* xgettext:c-format */
+  /* xgettext:c-format */
   fprintf (file, _("private flags = %lx: "), elf_elfheader (abfd)->e_flags);
 
   switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH)
     {
     default:
     case E_V850_ARCH: fprintf (file, _("v850 architecture")); break;
-    case E_V850E_ARCH:  fprintf (file, _("v850e architecture")); break;
+    case E_V850E_ARCH: fprintf (file, _("v850e architecture")); break;
     case E_V850E1_ARCH: fprintf (file, _("v850e1 architecture")); break;
+    case E_V850E2_ARCH: fprintf (file, _("v850e2 architecture")); break;
+    case E_V850E2V3_ARCH: fprintf (file, _("v850e2v3 architecture")); break;
     }
 
   fputc ('\n', file);
@@ -2009,10 +2396,9 @@ static asymbol * v850_elf_zcom_symbol_ptr;
    corresponding ELF section index.  */
 
 static bfd_boolean
-v850_elf_section_from_bfd_section (abfd, sec, retval)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asection *sec;
-     int *retval;
+v850_elf_section_from_bfd_section (bfd *abfd ATTRIBUTE_UNUSED,
+                                  asection *sec,
+                                  int *retval)
 {
   if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
     *retval = SHN_V850_SCOMMON;
@@ -2029,9 +2415,7 @@ v850_elf_section_from_bfd_section (abfd, sec, retval)
 /* Handle the special V850 section numbers that a symbol may use.  */
 
 static void
-v850_elf_symbol_processing (abfd, asym)
-     bfd *abfd;
-     asymbol *asym;
+v850_elf_symbol_processing (bfd *abfd, asymbol *asym)
 {
   elf_symbol_type * elfsym = (elf_symbol_type *) asym;
   unsigned int indx;
@@ -2045,7 +2429,7 @@ v850_elf_symbol_processing (abfd, asym)
      FIXME: Should we alter the st_shndx field as well ?  */
 
   if (indx < elf_numsections (abfd))
-    switch (elf_elfsections(abfd)[indx]->sh_type)
+    switch (elf_elfsections (abfd)[indx]->sh_type)
       {
       case SHT_V850_SCOMMON:
        indx = SHN_V850_SCOMMON;
@@ -2125,14 +2509,13 @@ v850_elf_symbol_processing (abfd, asym)
    file.  We must handle the special v850 section numbers here.  */
 
 static bfd_boolean
-v850_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *abfd;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     Elf_Internal_Sym *sym;
-     const char **namep ATTRIBUTE_UNUSED;
-     flagword *flagsp ATTRIBUTE_UNUSED;
-     asection **secp;
-     bfd_vma *valp;
+v850_elf_add_symbol_hook (bfd *abfd,
+                         struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                         Elf_Internal_Sym *sym,
+                         const char **namep ATTRIBUTE_UNUSED,
+                         flagword *flagsp ATTRIBUTE_UNUSED,
+                         asection **secp,
+                         bfd_vma *valp)
 {
   unsigned int indx = sym->st_shndx;
 
@@ -2143,7 +2526,7 @@ v850_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
      FIXME: Should we alter the st_shndx field as well ?  */
 
   if (indx < elf_numsections (abfd))
-    switch (elf_elfsections(abfd)[indx]->sh_type)
+    switch (elf_elfsections (abfd)[indx]->sh_type)
       {
       case SHT_V850_SCOMMON:
        indx = SHN_V850_SCOMMON;
@@ -2185,13 +2568,12 @@ v850_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
   return TRUE;
 }
 
-static bfd_boolean
-v850_elf_link_output_symbol_hook (info, name, sym, input_sec, h)
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     const char *name ATTRIBUTE_UNUSED;
-     Elf_Internal_Sym *sym;
-     asection *input_sec;
-     struct elf_link_hash_entry *h ATTRIBUTE_UNUSED;
+static int
+v850_elf_link_output_symbol_hook (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                                 const char *name ATTRIBUTE_UNUSED,
+                                 Elf_Internal_Sym *sym,
+                                 asection *input_sec,
+                                 struct elf_link_hash_entry *h ATTRIBUTE_UNUSED)
 {
   /* If we see a common symbol, which implies a relocatable link, then
      if a symbol was in a special common section in an input file, mark
@@ -2207,7 +2589,13 @@ v850_elf_link_output_symbol_hook (info, name, sym, input_sec, h)
        sym->st_shndx = SHN_V850_ZCOMMON;
     }
 
-  return TRUE;
+  /* The price we pay for using h->other unused bits as flags in the
+     linker is cleaning up after ourselves.  */
+
+  sym->st_other &= ~(V850_OTHER_SDA | V850_OTHER_ZDA | V850_OTHER_TDA
+                    | V850_OTHER_ERROR);
+
+  return 1;
 }
 
 static bfd_boolean
@@ -2242,23 +2630,18 @@ v850_elf_section_from_shdr (bfd *abfd,
    by the section name, which is a hack, but ought to work.  */
 
 static bfd_boolean
-v850_elf_fake_sections (abfd, hdr, sec)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     Elf_Internal_Shdr *hdr;
-     asection *sec;
+v850_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED,
+                       Elf_Internal_Shdr *hdr,
+                       asection *sec)
 {
-  register const char * name;
+  const char * name;
 
   name = bfd_get_section_name (abfd, sec);
 
   if (strcmp (name, ".scommon") == 0)
-    {
-      hdr->sh_type = SHT_V850_SCOMMON;
-    }
+    hdr->sh_type = SHT_V850_SCOMMON;
   else if (strcmp (name, ".tcommon") == 0)
-    {
-      hdr->sh_type = SHT_V850_TCOMMON;
-    }
+    hdr->sh_type = SHT_V850_TCOMMON;
   else if (strcmp (name, ".zcommon") == 0)
     hdr->sh_type = SHT_V850_ZCOMMON;
 
@@ -2268,18 +2651,17 @@ v850_elf_fake_sections (abfd, hdr, sec)
 /* Delete some bytes from a section while relaxing.  */
 
 static bfd_boolean
-v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
-     bfd *abfd;
-     asection *sec;
-     bfd_vma addr;
-     bfd_vma toaddr;
-     int count;
+v850_elf_relax_delete_bytes (bfd *abfd,
+                            asection *sec,
+                            bfd_vma addr,
+                            bfd_vma toaddr,
+                            int count)
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf32_External_Sym *extsyms;
   Elf32_External_Sym *esym;
   Elf32_External_Sym *esymend;
-  int index;
+  int sym_index;
   unsigned int sec_shndx;
   bfd_byte *contents;
   Elf_Internal_Rela *irel;
@@ -2427,12 +2809,12 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
   esym = extsyms + symtab_hdr->sh_info;
   esymend = extsyms + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
 
-  for (index = 0; esym < esymend; esym ++, index ++)
+  for (sym_index = 0; esym < esymend; esym ++, sym_index ++)
     {
       Elf_Internal_Sym isym;
 
       bfd_elf32_swap_symbol_in (abfd, esym, shndx, & isym);
-      sym_hash = elf_sym_hashes (abfd) [index];
+      sym_hash = elf_sym_hashes (abfd) [sym_index];
 
       if (isym.st_shndx == sec_shndx
          && ((sym_hash)->root.type == bfd_link_hash_defined
@@ -2474,31 +2856,30 @@ v850_elf_relax_delete_bytes (abfd, sec, addr, toaddr, count)
 }
 
 #define NOP_OPCODE     (0x0000)
-#define MOVHI          0x0640                          /* 4byte */
+#define MOVHI          0x0640                          /* 4byte */
 #define MOVHI_MASK     0x07e0
-#define MOVHI_R1(insn) ((insn) & 0x1f)                 /* 4byte */
+#define MOVHI_R1(insn) ((insn) & 0x1f)                 /* 4byte */
 #define MOVHI_R2(insn) ((insn) >> 11)
-#define MOVEA          0x0620                          /* 2byte */
+#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         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          0x0240                                  /* 2byte */
 #define ADD_I_MASK     0x07e0
-#define ADD_I5(insn)   ((((insn) & 0x001f) << 11) >> 11)       /* 2byte */
+#define ADD_I5(insn)   ((((insn) & 0x001f) << 11) >> 11)       /* 2byte */
 #define ADD_R2(insn)   ((insn) >> 11)
-#define JMP_R          0x0060                                  /* 2byte */
+#define JMP_R          0x0060                                  /* 2byte */
 #define JMP_R_MASK     0xFFE0
 #define JMP_R1(insn)   ((insn) & 0x1f)
 
 static bfd_boolean
-v850_elf_relax_section (abfd, sec, link_info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *link_info;
-     bfd_boolean *again;
+v850_elf_relax_section (bfd *abfd,
+                       asection *sec,
+                       struct bfd_link_info *link_info,
+                       bfd_boolean *again)
 {
   Elf_Internal_Shdr *symtab_hdr;
   Elf_Internal_Rela *internal_relocs;
@@ -2522,8 +2903,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
   symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
 
   internal_relocs = (_bfd_elf_link_read_relocs
-                    (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-                     link_info->keep_memory));
+                    (abfd, sec, NULL, NULL, link_info->keep_memory));
   if (internal_relocs == NULL)
     goto error_return;
 
@@ -2605,7 +2985,7 @@ v850_elf_relax_section (abfd, sec, link_info, again)
                contents = elf_section_data (sec)->this_hdr.contents;
              else
                {
-                 if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+                 if (! bfd_malloc_and_get_section (abfd, sec, &contents))
                    goto error_return;
                }
            }
@@ -3124,92 +3504,34 @@ v850_elf_relax_section (abfd, sec, link_info, again)
   goto finish;
 }
 
-static struct bfd_elf_special_section const
-  v850_special_sections_c[]=
-{
-  { ".call_table_data", 16,  0, SHT_PROGBITS,     (SHF_ALLOC
-                                                   + SHF_WRITE) },
-  { ".call_table_text", 16,  0, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_EXECINSTR) },
-  { NULL,        0, 0, 0,            0 }
-};
-
-static struct bfd_elf_special_section const
-  v850_special_sections_r[]=
-{
-  { ".rosdata",          8, -2, SHT_PROGBITS,     (SHF_ALLOC
-                                                   + SHF_V850_GPREL) },
-  { ".rozdata",          8, -2, SHT_PROGBITS,     (SHF_ALLOC
-                                                   + SHF_V850_R0REL) },
-  { NULL,        0, 0, 0,            0 }
-};
-
-static struct bfd_elf_special_section const
-  v850_special_sections_s[]=
-{
-  { ".sdata",            6, -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_GPREL) },
-  { ".sbss",             5, -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_GPREL) },
-  { ".scommon",          8, -2, SHT_V850_SCOMMON, (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_GPREL) },
-  { NULL,        0, 0, 0,            0 }
-};
-
-static struct bfd_elf_special_section const
-  v850_special_sections_t[]=
-{
-  { ".tdata",            6, -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_EPREL) },
-  { ".tbss",             5, -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_EPREL) },
-  { ".tcommon",          8, -2, SHT_V850_TCOMMON, (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_R0REL) },
-  { NULL,               0,   0, 0,                0 }
-};
-
-static struct bfd_elf_special_section const
-  v850_special_sections_z[]=
-{
-  { ".zdata",            6, -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_R0REL) },
-  { ".zbss",             5, -2, SHT_NOBITS,       (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_R0REL) },
-  { ".zcommon",          8, -2, SHT_V850_ZCOMMON, (SHF_ALLOC + SHF_WRITE
-                                                   + SHF_V850_R0REL) },
-  { NULL,        0, 0, 0,            0 }
-};
-
-static struct bfd_elf_special_section const *
-  v850_elf_special_sections[27] =
+static const struct bfd_elf_special_section v850_elf_special_sections[] =
 {
-  NULL,                                /* 'a' */
-  NULL,                                /* 'b' */
-  v850_special_sections_c,     /* 'c' */
-  NULL,                                /* 'd' */
-  NULL,                                /* 'e' */
-  NULL,                                /* 'f' */
-  NULL,                                /* 'g' */
-  NULL,                                /* 'h' */
-  NULL,                                /* 'i' */
-  NULL,                                /* 'j' */
-  NULL,                                /* 'k' */
-  NULL,                                /* 'l' */
-  NULL,                                /* 'm' */
-  NULL,                                /* 'n' */
-  NULL,                                /* 'o' */
-  NULL,                                /* 'p' */
-  NULL,                                /* 'q' */
-  v850_special_sections_r,     /* 'r' */
-  v850_special_sections_s,     /* 's' */
-  v850_special_sections_t,     /* 't' */
-  NULL,                                /* 'u' */
-  NULL,                                /* 'v' */
-  NULL,                                /* 'w' */
-  NULL,                                /* 'x' */
-  NULL,                                /* 'y' */
-  v850_special_sections_z,     /* 'z' */
-  NULL                         /* other */
+  { 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
+                                                                + SHF_V850_GPREL) },
+  { STRING_COMMA_LEN (".rozdata"),        -2, SHT_PROGBITS,     (SHF_ALLOC
+                                                                + SHF_V850_R0REL) },
+  { 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
+                                                                + SHF_V850_GPREL) },
+  { 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
+                                                                + SHF_V850_EPREL) },
+  { 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
+                                                                + SHF_V850_EPREL) },
+  { 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
+                                                                + SHF_V850_R0REL) },
+  { STRING_COMMA_LEN (".zdata"),          -2, SHT_PROGBITS,     (SHF_ALLOC + SHF_WRITE
+                                                                + SHF_V850_R0REL) },
+  { NULL,                     0,           0, 0,                0 }
 };
 \f
 #define TARGET_LITTLE_SYM                      bfd_elf32_v850_vec
@@ -3217,6 +3539,7 @@ static struct bfd_elf_special_section const *
 #define ELF_ARCH                               bfd_arch_v850
 #define ELF_MACHINE_CODE                       EM_V850
 #define ELF_MACHINE_ALT1                       EM_CYGNUS_V850
+#define ELF_MACHINE_ALT2                       EM_V800 /* This is the value used by the GreenHills toolchain.  */
 #define ELF_MAXPAGESIZE                                0x1000
 
 #define elf_info_to_howto                      v850_elf_info_to_howto_rela
@@ -3233,7 +3556,6 @@ static struct bfd_elf_special_section const *
 #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_sweep_hook               v850_elf_gc_sweep_hook
 #define elf_backend_special_sections           v850_elf_special_sections
 
 #define elf_backend_can_gc_sections 1
@@ -3241,6 +3563,7 @@ static struct bfd_elf_special_section const *
 
 #define bfd_elf32_bfd_is_local_label_name      v850_elf_is_local_label_name
 #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_set_private_flags                v850_elf_set_private_flags
 #define bfd_elf32_bfd_print_private_bfd_data   v850_elf_print_private_bfd_data