Remove old versions of binutils.

Change-Id: If634d8d30cfa8c88ca3ba59691a0df4ee5596f85

1 files changed, 0 insertions, 1588 deletions

diff --git a/binutils-2.19/bfd/elf32-cr16.c b/binutils-2.19/bfd/elf32-cr16.c
deleted file mode 100644
index 84130b0..0000000
--- a/binutils-2.19/bfd/elf32-cr16.c
+++ /dev/null
@@ -1,1588 +0,0 @@
-/* BFD back-end for National Semiconductor's CR16 ELF
-   Copyright 2007 Free Software Foundation, Inc.
-   Written by M R Swami Reddy.
-
-   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 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   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.  */
-
-#include "sysdep.h"
-#include "bfd.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "libiberty.h"
-#include "elf-bfd.h"
-#include "elf/cr16.h"
-
-/* cr16_reloc_map array maps BFD relocation enum into a CRGAS relocation type.  */
-
-struct cr16_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_enum; /* BFD relocation enum.  */
-  unsigned short cr16_reloc_type;          /* CR16 relocation type.  */
-};
-
-static const struct cr16_reloc_map cr16_reloc_map[R_CR16_MAX] =
-{
-  {BFD_RELOC_NONE,           R_CR16_NONE},
-  {BFD_RELOC_CR16_NUM8,      R_CR16_NUM8},
-  {BFD_RELOC_CR16_NUM16,     R_CR16_NUM16},
-  {BFD_RELOC_CR16_NUM32,     R_CR16_NUM32},
-  {BFD_RELOC_CR16_NUM32a,    R_CR16_NUM32a},
-  {BFD_RELOC_CR16_REGREL4,   R_CR16_REGREL4},
-  {BFD_RELOC_CR16_REGREL4a,  R_CR16_REGREL4a},
-  {BFD_RELOC_CR16_REGREL14,  R_CR16_REGREL14},
-  {BFD_RELOC_CR16_REGREL14a, R_CR16_REGREL14a},
-  {BFD_RELOC_CR16_REGREL16,  R_CR16_REGREL16},
-  {BFD_RELOC_CR16_REGREL20,  R_CR16_REGREL20},
-  {BFD_RELOC_CR16_REGREL20a, R_CR16_REGREL20a},
-  {BFD_RELOC_CR16_ABS20,     R_CR16_ABS20},
-  {BFD_RELOC_CR16_ABS24,     R_CR16_ABS24},
-  {BFD_RELOC_CR16_IMM4,      R_CR16_IMM4},
-  {BFD_RELOC_CR16_IMM8,      R_CR16_IMM8},
-  {BFD_RELOC_CR16_IMM16,     R_CR16_IMM16},
-  {BFD_RELOC_CR16_IMM20,     R_CR16_IMM20},
-  {BFD_RELOC_CR16_IMM24,     R_CR16_IMM24},
-  {BFD_RELOC_CR16_IMM32,     R_CR16_IMM32},
-  {BFD_RELOC_CR16_IMM32a,    R_CR16_IMM32a},
-  {BFD_RELOC_CR16_DISP4,     R_CR16_DISP4},
-  {BFD_RELOC_CR16_DISP8,     R_CR16_DISP8},
-  {BFD_RELOC_CR16_DISP16,    R_CR16_DISP16},
-  {BFD_RELOC_CR16_DISP24,    R_CR16_DISP24},
-  {BFD_RELOC_CR16_DISP24a,   R_CR16_DISP24a},
-  {BFD_RELOC_CR16_SWITCH8,   R_CR16_SWITCH8},
-  {BFD_RELOC_CR16_SWITCH16,  R_CR16_SWITCH16},
-  {BFD_RELOC_CR16_SWITCH32,  R_CR16_SWITCH32}
-};
-
-static reloc_howto_type cr16_elf_howto_table[] =
-{
-  HOWTO (R_CR16_NONE,              /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         32,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_dont,   /* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_NONE",            /* name */
-         FALSE,                    /* partial_inplace */
-         0,                        /* src_mask */
-         0,                        /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_NUM8,              /* type */
-         0,                        /* rightshift */
-         0,                        /* size */
-         8,                        /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_NUM8",            /* name */
-         FALSE,                    /* partial_inplace */
-         0xff,                     /* src_mask */
-         0xff,                     /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_NUM16,             /* type */
-         0,                        /* rightshift */
-         1,                        /* size */
-         16,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_NUM16",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xffff,                   /* src_mask */
-         0xffff,                   /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_NUM32,             /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         32,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_NUM32",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xffffffff,               /* src_mask */
-         0xffffffff,               /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_NUM32a,            /* type */
-         1,                        /* rightshift */
-         2,                        /* size */
-         32,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_NUM32a",          /* name */
-         FALSE,                    /* partial_inplace */
-         0xffffffff,               /* src_mask */
-         0xffffffff,               /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_REGREL4,           /* type */
-         0,                        /* rightshift */
-         0,                        /* size */
-         4,                        /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_REGREL4",         /* name */
-         FALSE,                    /* partial_inplace */
-         0xf,                      /* src_mask */
-         0xf,                      /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_REGREL4a,          /* type */
-         0,                        /* rightshift */
-         0,                        /* size */
-         4,                        /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_REGREL4a",        /* name */
-         FALSE,                    /* partial_inplace */
-         0xf,                      /* src_mask */
-         0xf,                      /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_REGREL14,          /* type */
-         0,                        /* rightshift */
-         1,                        /* size */
-         14,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_REGREL14",        /* name */
-         FALSE,                    /* partial_inplace */
-         0x3fff,                   /* src_mask */
-         0x3fff,                   /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_REGREL14a,         /* type */
-         0,                        /* rightshift */
-         1,                        /* size */
-         14,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_REGREL14a",       /* name */
-         FALSE,                    /* partial_inplace */
-         0x3fff,                   /* src_mask */
-         0x3fff,                   /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_REGREL16,          /* type */
-         0,                        /* rightshift */
-         1,                        /* size */
-         16,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_REGREL16",        /* name */
-         FALSE,                    /* partial_inplace */
-         0xffff,                   /* src_mask */
-         0xffff,                   /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_REGREL20,          /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         20,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_REGREL20",        /* name */
-         FALSE,                    /* partial_inplace */
-         0xfffff,                  /* src_mask */
-         0xfffff,                  /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_REGREL20a,         /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         20,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_REGREL20a",       /* name */
-         FALSE,                    /* partial_inplace */
-         0xfffff,                  /* src_mask */
-         0xfffff,                  /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_ABS20,             /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         20,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_ABS20",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xfffff,                  /* src_mask */
-         0xfffff,                  /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_ABS24,             /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         24,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_ABS24",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xffffff,                 /* src_mask */
-         0xffffff,                 /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_IMM4,              /* type */
-         0,                        /* rightshift */
-         0,                        /* size */
-         4,                        /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_IMM4",            /* name */
-         FALSE,                    /* partial_inplace */
-         0xf,                      /* src_mask */
-         0xf,                      /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_IMM8,              /* type */
-         0,                        /* rightshift */
-         0,                        /* size */
-         8,                        /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_IMM8",            /* name */
-         FALSE,                    /* partial_inplace */
-         0xff,                     /* src_mask */
-         0xff,                     /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_IMM16,             /* type */
-         0,                        /* rightshift */
-         1,                        /* size */
-         16,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_IMM16",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xffff,                   /* src_mask */
-         0xffff,                   /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_IMM20,             /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         20,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_IMM20",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xfffff,                  /* src_mask */
-         0xfffff,                  /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_IMM24,             /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         24,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_IMM24",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xffffff,                 /* src_mask */
-         0xffffff,                 /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_IMM32,             /* type */
-         0,                        /* rightshift */
-         2,                        /* size */
-         32,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_IMM32",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xffffffff,               /* src_mask */
-         0xffffffff,               /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_IMM32a,            /* type */
-         1,                        /* rightshift */
-         2,                        /* size */
-         32,                       /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_IMM32a",          /* name */
-         FALSE,                    /* partial_inplace */
-         0xffffffff,               /* src_mask */
-         0xffffffff,               /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_DISP4,             /* type */
-         1,                        /* rightshift */
-         0,                        /* size (0 = byte, 1 = short, 2 = long) */
-         4,                        /* bitsize */
-         TRUE,                     /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_unsigned, /* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_DISP4",           /* name */
-         FALSE,                    /* partial_inplace */
-         0xf,                      /* src_mask */
-         0xf,                      /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_DISP8,             /* type */
-         1,                        /* rightshift */
-         0,                        /* size (0 = byte, 1 = short, 2 = long) */
-         8,                        /* bitsize */
-         TRUE,                     /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_unsigned, /* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_DISP8",           /* name */
-         FALSE,                    /* partial_inplace */
-         0x1ff,                    /* src_mask */
-         0x1ff,                    /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_DISP16,            /* type */
-         0,                        /* rightshift REVIITS: To sync with WinIDEA*/
-         1,                        /* size (0 = byte, 1 = short, 2 = long) */
-         16,                       /* bitsize */
-         TRUE,                     /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_unsigned, /* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_DISP16",          /* name */
-         FALSE,                    /* partial_inplace */
-         0x1ffff,                  /* src_mask */
-         0x1ffff,                  /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-  /* REVISIT: DISP24 should be left-shift by 2 as per ISA doc
-     but its not done, to sync with WinIDEA and CR16 4.1 tools */
-  HOWTO (R_CR16_DISP24,            /* type */
-         0,                        /* rightshift */
-         2,                        /* size (0 = byte, 1 = short, 2 = long) */
-         24,                       /* bitsize */
-         TRUE,                     /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_unsigned, /* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_DISP24",          /* name */
-         FALSE,                    /* partial_inplace */
-         0x1ffffff,                /* src_mask */
-         0x1ffffff,                /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  HOWTO (R_CR16_DISP24a,           /* type */
-         0,                        /* rightshift */
-         2,                        /* size (0 = byte, 1 = short, 2 = long) */
-         24,                       /* bitsize */
-         TRUE,                     /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_unsigned, /* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_DISP24a",         /* name */
-         FALSE,                    /* partial_inplace */
-         0xffffff,                 /* src_mask */
-         0xffffff,                 /* dst_mask */
-         FALSE),                   /* pcrel_offset */
-
-  /* An 8 bit switch table entry.  This is generated for an expression
-     such as ``.byte L1 - L2''.  The offset holds the difference
-     between the reloc address and L2.  */
-  HOWTO (R_CR16_SWITCH8,           /* type */
-         0,                        /* rightshift */
-         0,                        /* size (0 = byte, 1 = short, 2 = long) */
-         8,                        /* bitsize */
-         FALSE,                    /* pc_relative */
-         0,                        /* bitpos */
-         complain_overflow_unsigned, /* complain_on_overflow */
-         bfd_elf_generic_reloc,    /* special_function */
-         "R_CR16_SWITCH8",         /* name */
-         FALSE,                    /* partial_inplace */
-         0xff,                     /* src_mask */
-         0xff,                     /* dst_mask */
-         TRUE),                    /* pcrel_offset */
-
-  /* A 16 bit switch table entry.  This is generated for an expression
-     such as ``.word L1 - L2''.  The offset holds the difference
-     between the reloc address and L2.  */
-  HOWTO (R_CR16_SWITCH16,          /* type */
-         0,                        /* rightshift */
-         1,                        /* 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_CR16_SWITCH16",        /* name */
-         FALSE,                    /* partial_inplace */
-         0xffff,                   /* src_mask */
-         0xffff,                   /* dst_mask */
-         TRUE),                    /* pcrel_offset */
-
-  /* A 32 bit switch table entry.  This is generated for an expression
-     such as ``.long L1 - L2''.  The offset holds the difference
-     between the reloc address and L2.  */
-  HOWTO (R_CR16_SWITCH32,          /* 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_CR16_SWITCH32",        /* name */
-         FALSE,                    /* partial_inplace */
-         0xffffffff,               /* src_mask */
-         0xffffffff,               /* dst_mask */
-         TRUE)                     /* pcrel_offset */
-};
-
-/* Retrieve a howto ptr using a BFD reloc_code.  */
-
-static reloc_howto_type *
-elf_cr16_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-                            bfd_reloc_code_real_type code)
-{
-  unsigned int i;
-
-  for (i = 0; i < R_CR16_MAX; i++)
-    if (code == cr16_reloc_map[i].bfd_reloc_enum)
-      return &cr16_elf_howto_table[cr16_reloc_map[i].cr16_reloc_type];
-
-  _bfd_error_handler ("Unsupported CR16 relocation type: 0x%x\n", code);
-  return NULL;
-}
-
-static reloc_howto_type *
-elf_cr16_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
-                            const char *r_name)
-{
-  unsigned int i;
-
-  for (i = 0; ARRAY_SIZE (cr16_elf_howto_table); i++)
-    if (cr16_elf_howto_table[i].name != NULL
-        && strcasecmp (cr16_elf_howto_table[i].name, r_name) == 0)
-      return cr16_elf_howto_table + i;
-
-  return NULL;
-}
-
-/* Retrieve a howto ptr using an internal relocation entry.  */
-
-static void
-elf_cr16_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *cache_ptr,
-                        Elf_Internal_Rela *dst)
-{
-  unsigned int r_type = ELF32_R_TYPE (dst->r_info);
-
-  BFD_ASSERT (r_type < (unsigned int) R_CR16_MAX);
-  cache_ptr->howto = &cr16_elf_howto_table[r_type];
-}
-
-/* Perform a relocation as part of a final link.  */
-
-static bfd_reloc_status_type
-cr16_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 Rvalue,
-                              bfd_vma addend,
-                              struct bfd_link_info *info ATTRIBUTE_UNUSED,
-                              asection *sec ATTRIBUTE_UNUSED,
-                              int is_local ATTRIBUTE_UNUSED)
-{
-  unsigned short r_type = howto->type;
-  bfd_byte *hit_data = contents + offset;
-  bfd_vma reloc_bits, check, Rvalue1;
-
-  switch (r_type)
-    {
-     case R_CR16_IMM4:
-     case R_CR16_IMM20:
-     case R_CR16_ABS20:
-       break;
-
-     case R_CR16_IMM8:
-     case R_CR16_IMM16:
-     case R_CR16_IMM32:
-     case R_CR16_IMM32a:
-     case R_CR16_REGREL4:
-     case R_CR16_REGREL4a:
-     case R_CR16_REGREL14:
-     case R_CR16_REGREL14a:
-     case R_CR16_REGREL16:
-     case R_CR16_REGREL20:
-     case R_CR16_ABS24:
-     case R_CR16_DISP16:
-     case R_CR16_DISP24:
-       /* 'hit_data' is relative to the start of the instruction, not the
-           relocation offset. Advance it to account for the exact offset.  */
-       hit_data += 2;
-       break;
-
-     case R_CR16_NONE:
-       return bfd_reloc_ok;
-       break;
-
-     case R_CR16_DISP4:
-       if (is_local)
-	 Rvalue += -1;
-       break;
-
-     case R_CR16_DISP8:
-     case R_CR16_DISP24a:
-       if (is_local)
-	 Rvalue -= -1;
-       break;
-
-     case R_CR16_SWITCH8:
-     case R_CR16_SWITCH16:
-     case R_CR16_SWITCH32:
-       /* We only care about the addend, where the difference between
-          expressions is kept.  */
-       Rvalue = 0;
-
-     default:
-       break;
-    }
-
-  if (howto->pc_relative)
-    {
-      /* Subtract the address of the section containing the location.  */
-      Rvalue -= (input_section->output_section->vma
-                 + input_section->output_offset);
-      /* Subtract the position of the location within the section.  */
-      Rvalue -= offset;
-    }
-
-  /* Add in supplied addend.  */
-  Rvalue += addend;
-
-  /* Complain if the bitfield overflows, whether it is considered
-     as signed or unsigned.  */
-  check = Rvalue >> howto->rightshift;
-
-  /* Assumes two's complement.  This expression avoids
-     overflow if howto->bitsize is the number of bits in
-     bfd_vma.  */
-  reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
-
-  if (((bfd_vma) check & ~reloc_bits) != 0
-      && (((bfd_vma) check & ~reloc_bits)
-      != (-(bfd_vma) 1 & ~reloc_bits)))
-    {
-      /* The above right shift is incorrect for a signed
-         value.  See if turning on the upper bits fixes the
-         overflow.  */
-      if (howto->rightshift && (bfd_signed_vma) Rvalue < 0)
-        {
-          check |= ((bfd_vma) - 1
-                    & ~((bfd_vma) - 1
-			>> howto->rightshift));
-
-          if (((bfd_vma) check & ~reloc_bits)
-              != (-(bfd_vma) 1 & ~reloc_bits))
-             return bfd_reloc_overflow;
-        }
-      else
-        return bfd_reloc_overflow;
-    }
-
-  /* Drop unwanted bits from the value we are relocating to.  */
-  Rvalue >>= (bfd_vma) howto->rightshift;
-
-  /* Apply dst_mask to select only relocatable part of the insn.  */
-  Rvalue &= howto->dst_mask;
-
-  switch (howto->size)
-    {
-      case 0:
-        if (r_type == R_CR16_DISP8)
-          {
-             Rvalue1 = bfd_get_16 (input_bfd, hit_data);
-             Rvalue = ((Rvalue1 & 0xf000) | ((Rvalue << 4) & 0xf00)
-                       | (Rvalue1 & 0x00f0) | (Rvalue & 0xf));
-             bfd_put_16 (input_bfd, Rvalue, hit_data);
-          }
-        else if (r_type == R_CR16_IMM4)
-          {
-             Rvalue1 = bfd_get_16 (input_bfd, hit_data);
-             Rvalue = (((Rvalue1 & 0xff) << 8) | ((Rvalue << 4) & 0xf0)
-                       | ((Rvalue1 & 0x0f00) >> 8));
-             bfd_put_16 (input_bfd, Rvalue, hit_data);
-          }
-        else if (r_type == R_CR16_DISP4)
-          {
-             Rvalue1 = bfd_get_16 (input_bfd, hit_data);
-             Rvalue = (Rvalue1 | ((Rvalue & 0xf) << 4));
-             bfd_put_16 (input_bfd, Rvalue, hit_data);
-          }
-        else 
-          {
-             bfd_put_8 (input_bfd, (unsigned char) Rvalue, hit_data);
-          }
-        break;
-
-      case 1:
-        if (r_type == R_CR16_DISP16)
-          {
-            Rvalue |= (bfd_get_16 (input_bfd, hit_data));
-            Rvalue = ((Rvalue & 0xfffe) | ((Rvalue >> 16) & 0x1));
-          }
-
-          bfd_put_16 (input_bfd, Rvalue, hit_data);
-        break;
-
-      case 2:
-        if ((r_type == R_CR16_ABS20) || (r_type == R_CR16_IMM20))
-          {
-             bfd_put_16 (input_bfd, (bfd_get_16 (input_bfd, hit_data))
-			 | ((Rvalue >> 16) & 0xf), hit_data);
-             bfd_put_16 (input_bfd, (Rvalue) & 0xffff, hit_data + 2);
-          }
-        else   
-          {
-            if (r_type == R_CR16_ABS24)
-              {
-                Rvalue = ((((Rvalue >> 20)& 0xf) | (((Rvalue >> 16) & 0xf) << 8)
-                          | (bfd_get_16 (input_bfd, hit_data))) 
-                          | ((Rvalue & 0xffff) << 16));
-              }
-            if (r_type == R_CR16_DISP24)
-              {
-                Rvalue = ((((Rvalue >> 20)& 0xf) | (((Rvalue >>16) & 0xf) << 8)
-                          | (bfd_get_16 (input_bfd, hit_data))) 
-                          | (((Rvalue & 0xfffe)
-                              | ((Rvalue >> 24) & 0x1)) << 16));
-              }
-            else if ((r_type == R_CR16_IMM32) ||(r_type == R_CR16_IMM32a))
-              {
-                Rvalue = (((Rvalue >> 16)& 0xffff)
-                          | (bfd_get_16 (input_bfd, hit_data))) 
-                          | ((Rvalue & 0xffff) << 16);
-              }
-            else if (r_type == R_CR16_DISP24a)
-              {
-                Rvalue = (((Rvalue & 0xfffffe) | (Rvalue >> 23)));
-                Rvalue = ((Rvalue >> 16) & 0xff) | ((Rvalue & 0xffff) << 16)
-                          | (bfd_get_32 (input_bfd, hit_data));
-              }
-
-            bfd_put_32 (input_bfd, Rvalue, hit_data);
-          }
-        break;
-
-      default:
-        return bfd_reloc_notsupported;
-    }
-
-  return bfd_reloc_ok;
-}
-
-/* Delete some bytes from a section while relaxing.  */
-
-static bfd_boolean
-elf32_cr16_relax_delete_bytes (struct bfd_link_info *link_info, bfd *abfd,
-                               asection *sec, bfd_vma addr, int count)
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  unsigned int sec_shndx;
-  bfd_byte *contents;
-  Elf_Internal_Rela *irel, *irelend;
-  Elf_Internal_Rela *irelalign;
-  bfd_vma toaddr;
-  Elf_Internal_Sym *isym;
-  Elf_Internal_Sym *isymend;
-  struct elf_link_hash_entry **sym_hashes;
-  struct elf_link_hash_entry **end_hashes;
-  struct elf_link_hash_entry **start_hashes;
-  unsigned int symcount;
-
-  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-
-  contents = elf_section_data (sec)->this_hdr.contents;
-
-  /* The deletion must stop at the next ALIGN reloc for an aligment
-     power larger than the number of bytes we are deleting.  */
-  irelalign = NULL;
-  toaddr = sec->size;
-
-  irel = elf_section_data (sec)->relocs;
-  irelend = irel + sec->reloc_count;
-
-  /* Actually delete the bytes.  */
-  memmove (contents + addr, contents + addr + count,
-           (size_t) (toaddr - addr - count));
-  sec->size -= count;
-
-  /* Adjust all the relocs.  */
-  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
-    /* Get the new reloc address.  */
-    if ((irel->r_offset > addr && irel->r_offset < toaddr))
-        irel->r_offset -= count;
-
-  /* Adjust the local symbols defined in this section.  */
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
-  for (isymend = isym + symtab_hdr->sh_info; isym < isymend; isym++)
-    {
-      if (isym->st_shndx == sec_shndx
-          && isym->st_value > addr
-          && isym->st_value < toaddr)
-        {
-          /* Adjust the addend of SWITCH relocations in this section,
-             which reference this local symbol.  */
-          for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
-            {
-              unsigned long r_symndx;
-              Elf_Internal_Sym *rsym;
-              bfd_vma addsym, subsym;
-
-              /* Skip if not a SWITCH relocation.  */
-              if (ELF32_R_TYPE (irel->r_info) != (int) R_CR16_SWITCH8
-		  && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_SWITCH16
-		  && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_SWITCH32)
-                continue;
-
-              r_symndx = ELF32_R_SYM (irel->r_info);
-              rsym = (Elf_Internal_Sym *) symtab_hdr->contents + r_symndx;
-
-              /* Skip if not the local adjusted symbol.  */
-              if (rsym != isym)
-                continue;
-
-              addsym = isym->st_value;
-              subsym = addsym - irel->r_addend;
-
-              /* Fix the addend only when -->> (addsym > addr >= subsym).  */
-              if (subsym <= addr)
-                irel->r_addend -= count;
-              else
-                continue;
-            }
-
-          isym->st_value -= count;
-        }
-    }
-
-  /* Now adjust the global symbols defined in this section.  */
-  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
-               - symtab_hdr->sh_info);
-  sym_hashes = start_hashes = elf_sym_hashes (abfd);
-  end_hashes = sym_hashes + symcount;
-
-  for (; sym_hashes < end_hashes; sym_hashes++)
-    {
-      struct elf_link_hash_entry *sym_hash = *sym_hashes;
-
-      /* The '--wrap SYMBOL' option is causing a pain when the object file,
-         containing the definition of __wrap_SYMBOL, includes a direct
-         call to SYMBOL as well. Since both __wrap_SYMBOL and SYMBOL reference
-         the same symbol (which is __wrap_SYMBOL), but still exist as two
-         different symbols in 'sym_hashes', we don't want to adjust
-         the global symbol __wrap_SYMBOL twice.
-         This check is only relevant when symbols are being wrapped.  */
-      if (link_info->wrap_hash != NULL)
-        {
-          struct elf_link_hash_entry **cur_sym_hashes;
-
-          /* Loop only over the symbols whom been already checked.  */
-          for (cur_sym_hashes = start_hashes; cur_sym_hashes < sym_hashes;
-               cur_sym_hashes++)
-            /* If the current symbol is identical to 'sym_hash', that means
-               the symbol was already adjusted (or at least checked).  */
-            if (*cur_sym_hashes == sym_hash)
-              break;
-
-          /* Don't adjust the symbol again.  */
-          if (cur_sym_hashes < sym_hashes)
-            continue;
-        }
-
-      if ((sym_hash->root.type == bfd_link_hash_defined
-          || sym_hash->root.type == bfd_link_hash_defweak)
-          && sym_hash->root.u.def.section == sec
-          && sym_hash->root.u.def.value > addr
-          && sym_hash->root.u.def.value < toaddr)
-        sym_hash->root.u.def.value -= count;
-    }
-
-  return TRUE;
-}
-
-/* Relocate a CR16 ELF section.  */
-
-static bfd_boolean
-elf32_cr16_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, *relend;
-
-  if (info->relocatable)
-    return TRUE;
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      struct elf_link_hash_entry *h;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      r_type = ELF32_R_TYPE (rel->r_info);
-      howto = cr16_elf_howto_table + (r_type);
-
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-        {
-          sym = local_syms + r_symndx;
-          sec = local_sections[r_symndx];
-          relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
-        }
-      else
-        {
-          bfd_boolean unresolved_reloc, warned;
-
-          RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
-                                   r_symndx, symtab_hdr, sym_hashes,
-                                   h, sec, relocation,
-                                   unresolved_reloc, warned);
-        }
-
-      r = cr16_elf_final_link_relocate (howto, input_bfd, output_bfd,
-                                        input_section,
-                                        contents, rel->r_offset,
-                                        relocation, rel->r_addend,
-                                        info, sec, h == NULL);
-
-      if (r != bfd_reloc_ok)
-        {
-          const char *name;
-          const char *msg = NULL;
-
-          if (h != NULL)
-            name = h->root.root.string;
-          else
-            {
-              name = (bfd_elf_string_from_elf_section
-                      (input_bfd, symtab_hdr->sh_link, sym->st_name));
-              if (name == NULL || *name == '\0')
-                name = bfd_section_name (input_bfd, sec);
-            }
-
-          switch (r)
-            {
-             case bfd_reloc_overflow:
-               if (!((*info->callbacks->reloc_overflow)
-                     (info, (h ? &h->root : NULL), name, howto->name,
-                      (bfd_vma) 0, input_bfd, input_section,
-                      rel->r_offset)))
-                 return FALSE;
-               break;
-
-             case bfd_reloc_undefined:
-               if (!((*info->callbacks->undefined_symbol)
-                     (info, name, input_bfd, input_section,
-                      rel->r_offset, TRUE)))
-                 return FALSE;
-               break;
-
-             case bfd_reloc_outofrange:
-               msg = _("internal error: out of range error");
-               goto common_error;
-
-             case bfd_reloc_notsupported:
-               msg = _("internal error: unsupported relocation error");
-               goto common_error;
-
-             case bfd_reloc_dangerous:
-               msg = _("internal error: dangerous error");
-               goto common_error;
-
-             default:
-               msg = _("internal error: unknown error");
-               /* Fall through.  */
-
-             common_error:
-               if (!((*info->callbacks->warning)
-                     (info, msg, name, input_bfd, input_section,
-                      rel->r_offset)))
-                 return FALSE;
-               break;
-            }
-        }
-    }
-
-  return TRUE;
-}
-
-/* This is a version of bfd_generic_get_relocated_section_contents
-   which uses elf32_cr16_relocate_section.  */
-
-static bfd_byte *
-elf32_cr16_get_relocated_section_contents (bfd *output_bfd,
-                                           struct bfd_link_info *link_info,
-                                           struct bfd_link_order *link_order,
-                                           bfd_byte *data,
-                                           bfd_boolean relocatable,
-                                           asymbol **symbols)
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  asection *input_section = link_order->u.indirect.section;
-  bfd *input_bfd = input_section->owner;
-  asection **sections = NULL;
-  Elf_Internal_Rela *internal_relocs = NULL;
-  Elf_Internal_Sym *isymbuf = NULL;
-
-  /* We only need to handle the case of relaxing, or of having a
-     particular set of section contents, specially.  */
-  if (relocatable
-      || elf_section_data (input_section)->this_hdr.contents == NULL)
-    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
-                                                       link_order, data,
-                                                       relocatable,
-                                                       symbols);
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
-          (size_t) input_section->size);
-
-  if ((input_section->flags & SEC_RELOC) != 0
-      && input_section->reloc_count > 0)
-    {
-      Elf_Internal_Sym *isym;
-      Elf_Internal_Sym *isymend;
-      asection **secpp;
-      bfd_size_type amt;
-
-      internal_relocs = _bfd_elf_link_read_relocs (input_bfd, input_section,
-                                                   NULL, NULL, FALSE);
-      if (internal_relocs == NULL)
-        goto error_return;
-
-      if (symtab_hdr->sh_info != 0)
-        {
-          isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
-          if (isymbuf == NULL)
-            isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
-                                            symtab_hdr->sh_info, 0,
-                                            NULL, NULL, NULL);
-          if (isymbuf == NULL)
-            goto error_return;
-        }
-
-      amt = symtab_hdr->sh_info;
-      amt *= sizeof (asection *);
-      sections = bfd_malloc (amt);
-      if (sections == NULL && amt != 0)
-        goto error_return;
-
-      isymend = isymbuf + symtab_hdr->sh_info;
-      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
-        {
-          asection *isec;
-
-          if (isym->st_shndx == SHN_UNDEF)
-            isec = bfd_und_section_ptr;
-          else if (isym->st_shndx == SHN_ABS)
-            isec = bfd_abs_section_ptr;
-          else if (isym->st_shndx == SHN_COMMON)
-            isec = bfd_com_section_ptr;
-          else
-            isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
-
-          *secpp = isec;
-        }
-
-      if (! elf32_cr16_relocate_section (output_bfd, link_info, input_bfd,
-                                     input_section, data, internal_relocs,
-                                     isymbuf, sections))
-        goto error_return;
-
-      if (sections != NULL)
-        free (sections);
-      if (isymbuf != NULL
-          && symtab_hdr->contents != (unsigned char *) isymbuf)
-        free (isymbuf);
-      if (elf_section_data (input_section)->relocs != internal_relocs)
-        free (internal_relocs);
-    }
-
-  return data;
-
- error_return:
-  if (sections != NULL)
-    free (sections);
-  if (isymbuf != NULL
-      && symtab_hdr->contents != (unsigned char *) isymbuf)
-    free (isymbuf);
-  if (internal_relocs != NULL
-      && elf_section_data (input_section)->relocs != internal_relocs)
-    free (internal_relocs);
-  return NULL;
-}
-
-/* This function handles relaxing for the CR16.
-
-   There's quite a few relaxing opportunites available on the CR16:
-
-        * bcond:24 -> bcond:16                                2 bytes
-        * bcond:16 -> bcond:8                                 2 bytes
-        * arithmetic imm32 -> arithmetic imm20/imm16          2 bytes
-        * arithmetic imm20/imm16 -> arithmetic imm4           2 bytes
-
-   Symbol- and reloc-reading infrastructure copied from elf-m10200.c.  */
-
-static bfd_boolean
-elf32_cr16_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;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *contents = NULL;
-  Elf_Internal_Sym *isymbuf = NULL;
-
-  /* Assume nothing changes.  */
-  *again = FALSE;
-
-  /* We don't have to do anything for a relocatable link, if
-     this section does not have relocs, or if this is not a
-     code section.  */
-  if (link_info->relocatable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0
-      || (sec->flags & SEC_CODE) == 0)
-    return TRUE;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-
-  /* Get a copy of the native relocations.  */
-  internal_relocs = _bfd_elf_link_read_relocs (abfd, sec, NULL, NULL,
-                                               link_info->keep_memory);
-  if (internal_relocs == NULL)
-    goto error_return;
-
-  /* Walk through them looking for relaxing opportunities.  */
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma symval;
-
-      /* If this isn't something that can be relaxed, then ignore
-         this reloc.  */
-      if (ELF32_R_TYPE (irel->r_info) != (int) R_CR16_DISP16
-          && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_DISP24
-          && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_IMM32
-          && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_IMM20
-          && ELF32_R_TYPE (irel->r_info) != (int) R_CR16_IMM16)
-        continue;
-
-      /* Get the section contents if we haven't done so already.  */
-      if (contents == NULL)
-        {
-          /* Get cached copy if it exists.  */
-          if (elf_section_data (sec)->this_hdr.contents != NULL)
-            contents = elf_section_data (sec)->this_hdr.contents;
-          /* Go get them off disk.  */
-          else if (!bfd_malloc_and_get_section (abfd, sec, &contents))
-            goto error_return;
-        }
-
-      /* Read this BFD's local symbols if we haven't done so already.  */
-      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
-        {
-          isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
-          if (isymbuf == NULL)
-            isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
-                                            symtab_hdr->sh_info, 0,
-                                            NULL, NULL, NULL);
-          if (isymbuf == NULL)
-            goto error_return;
-        }
-
-      /* Get the value of the symbol referred to by the reloc.  */
-      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
-        {
-          /* A local symbol.  */
-          Elf_Internal_Sym *isym;
-          asection *sym_sec;
-
-          isym = isymbuf + ELF32_R_SYM (irel->r_info);
-          if (isym->st_shndx == SHN_UNDEF)
-            sym_sec = bfd_und_section_ptr;
-          else if (isym->st_shndx == SHN_ABS)
-            sym_sec = bfd_abs_section_ptr;
-          else if (isym->st_shndx == SHN_COMMON)
-            sym_sec = bfd_com_section_ptr;
-          else
-            sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
-          symval = (isym->st_value
-                    + sym_sec->output_section->vma
-                    + sym_sec->output_offset);
-        }
-      else
-        {
-          unsigned long indx;
-          struct elf_link_hash_entry *h;
-
-          /* An external symbol.  */
-          indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
-          h = elf_sym_hashes (abfd)[indx];
-          BFD_ASSERT (h != NULL);
-
-          if (h->root.type != bfd_link_hash_defined
-              && h->root.type != bfd_link_hash_defweak)
-            /* This appears to be a reference to an undefined
-               symbol.  Just ignore it--it will be caught by the
-               regular reloc processing.  */
-            continue;
-
-          symval = (h->root.u.def.value
-                    + h->root.u.def.section->output_section->vma
-                    + h->root.u.def.section->output_offset);
-        }
-
-      /* For simplicity of coding, we are going to modify the section
-         contents, the section relocs, and the BFD symbol table.  We
-         must tell the rest of the code not to free up this
-         information.  It would be possible to instead create a table
-         of changes which have to be made, as is done in coff-mips.c;
-         that would be more work, but would require less memory when
-         the linker is run.  */
-
-      /* Try to turn a 24  branch/call into a 16bit relative
-         branch/call.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_DISP24)
-        {
-          bfd_vma value = symval;
-
-          /* Deal with pc-relative gunk.  */
-          value -= (sec->output_section->vma + sec->output_offset);
-          value -= irel->r_offset;
-          value += irel->r_addend;
-
-          /* See if the value will fit in 16 bits, note the high value is
-             0xfffe + 2 as the target will be two bytes closer if we are
-             able to relax.  */
-          if ((long) value < 0x10000 && (long) value > -0x10002)
-            {
-              unsigned int code;
-
-              /* Get the opcode.  */
-              code = (unsigned int) bfd_get_32 (abfd, contents + irel->r_offset);
-
-              /* Verify it's a 'bcond' and fix the opcode.  */
-              if ((code  & 0xffff) == 0x0010)
-                {
-		  bfd_put_16 (abfd, 0x1800 | ((0xf & (code >> 20)) << 4), contents + irel->r_offset);
-		  bfd_put_16 (abfd, value, contents + irel->r_offset + 2);
-                }
-              else
-                continue;
-
-              /* Note that we've changed the relocs, section contents, etc.  */
-              elf_section_data (sec)->relocs = internal_relocs;
-              elf_section_data (sec)->this_hdr.contents = contents;
-              symtab_hdr->contents = (unsigned char *) isymbuf;
-
-              /* Fix the relocation's type.  */
-              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-                                           R_CR16_DISP16);
-
-              /* Delete two bytes of data.  */
-              if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
-                                                   irel->r_offset + 2, 2))
-                goto error_return;
-
-              /* That will change things, so, we should relax again.
-                 Note that this is not required, and it may be slow.  */
-              *again = TRUE;
-            }
-        }
-
-      /* Try to turn a 16-bit pc-relative branch into an
-         8-bit pc-relative branch.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_DISP16)
-        {
-          bfd_vma value = symval;
-
-          /* Deal with pc-relative gunk.  */
-          value -= (sec->output_section->vma + sec->output_offset);
-          value -= irel->r_offset;
-          value += irel->r_addend;
-
-          /* See if the value will fit in 8 bits, note the high value is
-             0xfc + 2 as the target will be two bytes closer if we are
-             able to relax.  */
-          if ((long) value < 0xfe && (long) value > -0x100)
-            {
-              unsigned short code;
-
-              /* Get the opcode.  */
-              code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
-
-              /* Verify it's a 'bcond' opcode.  */
-              if ((code & 0xff00) == 0x1800)
-                {
-                 bfd_put_8 (abfd, 0x1 | ((0xf & (code >> 4)) << 4), contents + irel->r_offset);
-                 bfd_put_8 (abfd, value, contents + irel->r_offset + 2);
-                }
-              else
-                continue;
-
-              /* Note that we've changed the relocs, section contents, etc.  */
-              elf_section_data (sec)->relocs = internal_relocs;
-              elf_section_data (sec)->this_hdr.contents = contents;
-              symtab_hdr->contents = (unsigned char *) isymbuf;
-
-              /* Fix the relocation's type.  */
-              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-                                           R_CR16_DISP8);
-
-              /* Delete two bytes of data.  */
-              if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
-                                                   irel->r_offset + 2, 2))
-                goto error_return;
-
-              /* That will change things, so, we should relax again.
-                 Note that this is not required, and it may be slow.  */
-              *again = TRUE;
-            }
-        }
-
-      /* Try to turn a 32bit immediate address into
-         a 20/16bit immediate address.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_IMM32)
-        {
-          bfd_vma value = symval;
-          unsigned short is_add_mov = 0;
-
-          /* See if the value will fit in 20 bits.  */
-          if ((long) value < 0xfffff && (long) value > 0)
-            {
-              unsigned short code;
-
-              /* Get the opcode.  */
-              code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
-
-              /* Verify it's a arithmetic ADDD or MOVD instruction.
-                 For ADDD and MOVD only, convert to IMM32 -> IMM20.  */
-              if (((code & 0xfff0) == 0x0070) || ((code & 0xfff0) == 0x0020))
-                is_add_mov = 1;
-
-              if (is_add_mov)
-                {
-                  /* Note that we've changed the relocs, section contents, 
-                     etc.  */
-                  elf_section_data (sec)->relocs = internal_relocs;
-                  elf_section_data (sec)->this_hdr.contents = contents;
-                  symtab_hdr->contents = (unsigned char *) isymbuf;
-
-                  /* Fix the opcode.  */
-                  if ((code & 0xfff0) == 0x0070) /* For movd.  */
-                    bfd_put_8 (abfd, 0x05, contents + irel->r_offset + 1);
-                  else                          /* code == 0x0020 for addd.  */
-                    bfd_put_8 (abfd, 0x04, contents + irel->r_offset + 1);
- 
-                  bfd_put_8 (abfd, (code & 0xf) << 4, contents + irel->r_offset);
-
-
-                  /* Fix the relocation's type.  */
-                  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					       R_CR16_IMM20);
-                  /* Delete two bytes of data.  */
-                  if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
-						      irel->r_offset + 2, 2))
-                    goto error_return;
-
-                  /* That will change things, so, we should relax again.
-                     Note that this is not required, and it may be slow.  */
-                  *again = TRUE;
-                }
-            }
-         /* See if the value will fit in 16 bits.  */
-          if ((!is_add_mov) && ((long) value < 0x7fff && (long) value > 0))
-            {
-              unsigned short code;
-
-              /* Get the opcode.  */
-              code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
-
-              /* Note that we've changed the relocs, section contents, etc.  */
-              elf_section_data (sec)->relocs = internal_relocs;
-              elf_section_data (sec)->this_hdr.contents = contents;
-              symtab_hdr->contents = (unsigned char *) isymbuf;
-
-              /* Fix the opcode.  */
-              if ((code & 0xf0) == 0x70)          /* For movd.  */
-                bfd_put_8 (abfd, 0x54, contents + irel->r_offset + 1);
-              else if ((code & 0xf0) == 0x20)     /* For addd.  */
-                bfd_put_8 (abfd, 0x60, contents + irel->r_offset + 1);
-              else if ((code & 0xf0) == 0x90)     /* For cmpd.  */
-                bfd_put_8 (abfd, 0x56, contents + irel->r_offset + 1);
-              else
-                continue;
-
-              bfd_put_8 (abfd, 0xb0 | (code & 0xf), contents + irel->r_offset);
-
-              /* Fix the relocation's type.  */
-              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-                                           R_CR16_IMM16);
-
-              /* Delete two bytes of data.  */
-              if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
-                                                  irel->r_offset + 2, 2))
-                 goto error_return;
-
-              /* That will change things, so, we should relax again.
-                 Note that this is not required, and it may be slow.  */
-                 *again = TRUE;
-            }
-        }
-
-      /* Try to turn a 20/16bit immediate address into
-         a 4bit immediate address.  */
-      if ((ELF32_R_TYPE (irel->r_info) == (int) R_CR16_IMM20)
-          || (ELF32_R_TYPE (irel->r_info) == (int) R_CR16_IMM16))
-        {
-          bfd_vma value = symval;
-
-          /* See if the value will fit in 4 bits.  */
-          if ((long) value < 0xf && (long) value > 0)
-            {
-              unsigned short code;
-
-              /* Get the opcode.  */
-              code = (unsigned short) bfd_get_16 (abfd, contents + irel->r_offset);
-
-              /* Note that we've changed the relocs, section contents, etc.  */
-              elf_section_data (sec)->relocs = internal_relocs;
-              elf_section_data (sec)->this_hdr.contents = contents;
-              symtab_hdr->contents = (unsigned char *) isymbuf;
-
-              /* Fix the opcode.  */
-              if (((code & 0x0f00) == 0x0400) || ((code & 0x0f00) == 0x0500))
-                {
-                  if ((code & 0x0f00) == 0x0400)      /* For movd imm20.  */
-                    bfd_put_8 (abfd, 0x60, contents + irel->r_offset);
-                  else                                /* For addd imm20.  */
-                    bfd_put_8 (abfd, 0x54, contents + irel->r_offset);
-                  bfd_put_8 (abfd, (code & 0xf0) >> 4, contents + irel->r_offset + 1);
-                }
-              else
-                {
-                  if ((code & 0xfff0) == 0x56b0)       /*  For cmpd imm16.  */
-                    bfd_put_8 (abfd, 0x56, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x54b0)  /*  For movd imm16.  */
-                    bfd_put_8 (abfd, 0x54, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x58b0)  /*  For movb imm16.  */
-                    bfd_put_8 (abfd, 0x58, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x5Ab0)  /*  For movw imm16.  */
-                    bfd_put_8 (abfd, 0x5A, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x60b0)  /*  For addd imm16.  */
-                    bfd_put_8 (abfd, 0x60, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x30b0)  /*  For addb imm16.  */
-                    bfd_put_8 (abfd, 0x30, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x2Cb0)  /*  For addub imm16.  */
-                    bfd_put_8 (abfd, 0x2C, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x32b0)  /*  For adduw imm16.  */
-                    bfd_put_8 (abfd, 0x32, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x38b0)  /*  For subb imm16.  */
-                    bfd_put_8 (abfd, 0x38, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x3Ab0)  /*  For subw imm16.  */
-                    bfd_put_8 (abfd, 0x3A, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x50b0)  /*  For cmpb imm16.  */
-                    bfd_put_8 (abfd, 0x50, contents + irel->r_offset);
-                  else if ((code & 0xfff0) == 0x52b0)  /*  For cmpw imm16.  */
-                    bfd_put_8 (abfd, 0x52, contents + irel->r_offset);
-                  else
-                    continue;
-              
-                  bfd_put_8 (abfd, (code & 0xf), contents + irel->r_offset + 1);
-                }
-
-              /* Fix the relocation's type.  */
-              irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-                                           R_CR16_IMM4);
-
-              /* Delete two bytes of data.  */
-              if (!elf32_cr16_relax_delete_bytes (link_info, abfd, sec,
-						  irel->r_offset + 2, 2))
-                goto error_return;
-
-              /* That will change things, so, we should relax again.
-                 Note that this is not required, and it may be slow.  */
-              *again = TRUE;
-            }
-        }
-    }
-
-  if (isymbuf != NULL
-      && symtab_hdr->contents != (unsigned char *) isymbuf)
-    {
-      if (! link_info->keep_memory)
-        free (isymbuf);
-      else
-	/* Cache the symbols for elf_link_input_bfd.  */
-	symtab_hdr->contents = (unsigned char *) isymbuf;
-    }
-
-  if (contents != NULL
-      && elf_section_data (sec)->this_hdr.contents != contents)
-    {
-      if (! link_info->keep_memory)
-        free (contents);
-      else
-	/* Cache the section contents for elf_link_input_bfd.  */
-	elf_section_data (sec)->this_hdr.contents = contents;
-    }
-
-  if (internal_relocs != NULL
-      && elf_section_data (sec)->relocs != internal_relocs)
-    free (internal_relocs);
-
-  return TRUE;
-
- error_return:
-  if (isymbuf != NULL
-      && symtab_hdr->contents != (unsigned char *) isymbuf)
-    free (isymbuf);
-  if (contents != NULL
-      && elf_section_data (sec)->this_hdr.contents != contents)
-    free (contents);
-  if (internal_relocs != NULL
-      && elf_section_data (sec)->relocs != internal_relocs)
-    free (internal_relocs);
-
-  return FALSE;
-}
-
-static asection *
-elf32_cr16_gc_mark_hook (asection *sec,
-			 struct bfd_link_info *info ATTRIBUTE_UNUSED,
-			 Elf_Internal_Rela *rel ATTRIBUTE_UNUSED,
-			 struct elf_link_hash_entry *h,
-			 Elf_Internal_Sym *sym)
-{
-  if (h == NULL)
-    return bfd_section_from_elf_index (sec->owner, sym->st_shndx);
-
-  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:
-        return NULL;
-    }
-}
-
-/* Update the got entry reference counts for the section being removed.  */
-
-static bfd_boolean
-elf32_cr16_gc_sweep_hook (bfd *abfd ATTRIBUTE_UNUSED,
-			  struct bfd_link_info *info ATTRIBUTE_UNUSED,
-			  asection *sec ATTRIBUTE_UNUSED,
-			  const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED)
-{
-  /* We don't support garbage collection of GOT and PLT relocs yet.  */
-  return TRUE;
-}
-
-/* Definitions for setting CR16 target vector.  */
-#define TARGET_LITTLE_SYM                 bfd_elf32_cr16_vec
-#define TARGET_LITTLE_NAME                "elf32-cr16"
-#define ELF_ARCH                          bfd_arch_cr16
-#define ELF_MACHINE_CODE                  EM_CR16
-#define ELF_MACHINE_ALT1                  EM_CR16_OLD
-#define ELF_MAXPAGESIZE                   0x1
-#define elf_symbol_leading_char           '_'
-
-#define bfd_elf32_bfd_reloc_type_lookup   elf_cr16_reloc_type_lookup
-#define bfd_elf32_bfd_reloc_name_lookup   elf_cr16_reloc_name_lookup
-#define elf_info_to_howto                 elf_cr16_info_to_howto
-#define elf_info_to_howto_rel             0
-#define elf_backend_relocate_section      elf32_cr16_relocate_section
-#define bfd_elf32_bfd_relax_section       elf32_cr16_relax_section
-#define bfd_elf32_bfd_get_relocated_section_contents \
-                                elf32_cr16_get_relocated_section_contents
-#define elf_backend_gc_mark_hook          elf32_cr16_gc_mark_hook
-#define elf_backend_gc_sweep_hook         elf32_cr16_gc_sweep_hook
-#define elf_backend_can_gc_sections       1
-#define elf_backend_rela_normal           1
-
-#include "elf32-target.h"