Update function declarations to ISO C90 formatting

1 files changed, 262 insertions, 289 deletions

diff --git a/bfd/elf32-d30v.c b/bfd/elf32-d30v.c
index b9bab63222..c96937d5da 100644
--- a/bfd/elf32-d30v.c
+++ b/bfd/elf32-d30v.c
@@ -1,23 +1,24 @@
 /* D30V-specific support for 32-bit ELF
-   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
    Contributed by Martin Hunt (hunt@cygnus.com).
 
-This file is part of BFD, the Binary File Descriptor library.
+   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
-(at your option) any later version.
+   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
+   (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.
+   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.  */
+   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 "bfd.h"
 #include "sysdep.h"
@@ -25,240 +26,17 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 #include "elf-bfd.h"
 #include "elf/d30v.h"
 
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void d30v_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static void d30v_info_to_howto_rela
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static bfd_reloc_status_type bfd_elf_d30v_reloc PARAMS ((
-     bfd *abfd,
-     arelent *reloc_entry,
-     asymbol *symbol,
-     PTR data,
-     asection *input_section,
-     bfd *output_bfd,
-     char **error_message));
-static bfd_reloc_status_type bfd_elf_d30v_reloc_21 PARAMS ((
-     bfd *abfd,
-     arelent *reloc_entry,
-     asymbol *symbol,
-     PTR data,
-     asection *input_section,
-     bfd *output_bfd,
-     char **error_message));
-
-static reloc_howto_type elf_d30v_howto_table[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_D30V_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_D30V_NONE",		/* name */
-	 FALSE,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* A 6 bit absolute relocation */
-  HOWTO (R_D30V_6,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_6",		/* name */
-	 FALSE,			/* partial_inplace */
-	 0x3f,			/* src_mask */
-	 0x3f,			/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* A relative 9 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_9_PCREL,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_9_PCREL",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x3f,			/* src_mask */
-	 0x3f,			/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-
-  /* A relative 9 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_9_PCREL_R,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_9_PCREL_R",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x3f,			/* src_mask */
-	 0x3f,			/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-
-  /* An absolute 15 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_15,		/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_15",		/* name */
-	 FALSE,			/* partial_inplace */
-	 0xfff,			/* src_mask */
-	 0xfff,			/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* A relative 15 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_15_PCREL,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_15_PCREL",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xfff,			/* src_mask */
-	 0xfff,			/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-
-  /* A relative 15 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_15_PCREL_R,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_15_PCREL_R",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xfff,			/* src_mask */
-	 0xfff,			/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-
-  /* An absolute 21 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_21,		/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 18,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_21",		/* name */
-	 FALSE,			/* partial_inplace */
-	 0x3ffff,		/* src_mask */
-	 0x3ffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* A relative 21 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_21_PCREL,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 18,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_21_PCREL",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x3ffff,		/* src_mask */
-	 0x3ffff,		/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-
-  /* A relative 21 bit relocation, right shifted by 3, in the Right container */
-  HOWTO (R_D30V_21_PCREL_R,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 18,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_21_PCREL_R",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0x3ffff,		/* src_mask */
-	 0x3ffff,		/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-
-  /* A D30V 32 bit absolute relocation */
-  HOWTO (R_D30V_32,		/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 FALSE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc,	/* special_function */
-	 "R_D30V_32",		/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-  /* A relative 32 bit relocation */
-  HOWTO (R_D30V_32_PCREL,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 TRUE,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc,	/* special_function */
-	 "R_D30V_32_PCREL",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 TRUE),			/* pcrel_offset */
-
-  /* A regular 32 bit absolute relocation */
-  HOWTO (R_D30V_32_NORMAL,		/* 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_D30V_32_NORMAL",	/* name */
-	 FALSE,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 FALSE),		/* pcrel_offset */
-
-};
-
 #define MAX32 ((bfd_signed_vma) 0x7fffffff)
 #define MIN32 (- MAX32 - 1)
 
 static bfd_reloc_status_type
-bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+bfd_elf_d30v_reloc (bfd *abfd,
+		    arelent *reloc_entry,
+		    asymbol *symbol,
+		    void * data,
+		    asection *input_section,
+		    bfd *output_bfd,
+		    char **error_message)
 {
   bfd_signed_vma relocation;
   bfd_vma in1, in2, num;
@@ -271,7 +49,7 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
   reloc_howto_type *howto = reloc_entry->howto;
   int make_absolute = 0;
 
-  if (output_bfd != (bfd *) NULL)
+  if (output_bfd != NULL)
     {
       /* Partial linking -- do nothing.  */
       reloc_entry->address += input_section->output_offset;
@@ -283,10 +61,10 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
   if (r != bfd_reloc_continue)
     return r;
 
-  /* a hacked-up version of bfd_perform_reloc() follows */
+  /* A hacked-up version of bfd_perform_reloc() follows.  */
  if (bfd_is_und_section (symbol->section)
       && (symbol->flags & BSF_WEAK) == 0
-      && output_bfd == (bfd *) NULL)
+      && output_bfd == NULL)
     flag = bfd_reloc_undefined;
 
   /* Is the address of the relocation really within the section?  */
@@ -313,10 +91,10 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 
   /* Here the variable relocation holds the final address of the
      symbol we are relocating against, plus any addend.  */
-
   if (howto->pc_relative)
     {
-      tmp_addr = input_section->output_section->vma + input_section->output_offset
+      tmp_addr = input_section->output_section->vma
+	+ input_section->output_offset
 	+ reloc_entry->address;
       relocation -= tmp_addr;
     }
@@ -324,7 +102,7 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
   in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
   in2 = bfd_get_32 (abfd, (bfd_byte *) data + addr + 4);
 
-  /* extract the addend */
+  /* Extract the addend.  */
   num = ((in2 & 0x3FFFF)
 	 | ((in2 & 0xFF00000) >> 2)
 	 | ((in1 & 0x3F) << 26));
@@ -345,12 +123,12 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 	}
     }
 
-  in1 |= (relocation >> 26) & 0x3F;	/* top 6 bits */
-  in2 |= ((relocation & 0x03FC0000) << 2);  /* next 8 bits */
-  in2 |= relocation & 0x0003FFFF;		/* bottom 18 bits */
+  in1 |= (relocation >> 26) & 0x3F;		/* Top 6 bits.  */
+  in2 |= ((relocation & 0x03FC0000) << 2);  	/* Next 8 bits.  */
+  in2 |= relocation & 0x0003FFFF;		/* Bottom 18 bits.  */
 
-  /* change a PC-relative instruction to its absolute equivalent */
-  /* with this simple hack */
+  /* Change a PC-relative instruction to its
+     absolute equivalent with this simple hack.  */
   if (make_absolute)
     in1 |= 0x00100000;
 
@@ -361,14 +139,13 @@ bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 }
 
 static bfd_reloc_status_type
-bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+bfd_elf_d30v_reloc_21 (bfd *abfd,
+		       arelent *reloc_entry,
+		       asymbol *symbol,
+		       void * data,
+		       asection *input_section,
+		       bfd *output_bfd,
+		       char **error_message)
 {
   bfd_vma relocation;
   bfd_vma in1, num;
@@ -380,7 +157,7 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
   reloc_howto_type *howto = reloc_entry->howto;
   int mask, max;
 
-  if (output_bfd != (bfd *) NULL)
+  if (output_bfd != NULL)
     {
       /* Partial linking -- do nothing.  */
       reloc_entry->address += input_section->output_offset;
@@ -392,10 +169,10 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
   if (r != bfd_reloc_continue)
     return r;
 
-  /* a hacked-up version of bfd_perform_reloc() follows */
- if (bfd_is_und_section (symbol->section)
+  /* A hacked-up version of bfd_perform_reloc() follows.  */
+  if (bfd_is_und_section (symbol->section)
       && (symbol->flags & BSF_WEAK) == 0
-      && output_bfd == (bfd *) NULL)
+      && output_bfd == NULL)
     flag = bfd_reloc_undefined;
 
   /* Is the address of the relocation really within the section?  */
@@ -438,30 +215,30 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
     mask <<= 12;
   max = (1 << (howto->bitsize + 2)) - 1;
 
-  /* extract the addend */
-  num = in1 & mask;  /* 18 bits */
+  /* Extract the addend.  */
+  num = in1 & mask;  /* 18 bits.  */
   if (howto->bitsize == 6)
     num >>= 12;
-  num <<= 3; /* shift left 3 */
-  in1 &= ~mask;  /* mask out addend */
+  num <<= 3; /* shift left 3.  */
+  in1 &= ~mask;  /* Mask out addend.  */
 
   relocation += num;
-  if (howto->type == R_D30V_21_PCREL_R || howto->type == R_D30V_15_PCREL_R ||
-      howto->type == R_D30V_9_PCREL_R )
-    {
-      relocation += 4;
-    }
+  if (howto->type == R_D30V_21_PCREL_R
+      || howto->type == R_D30V_15_PCREL_R
+      || howto->type == R_D30V_9_PCREL_R)
+    relocation += 4;
 
-  if ((int)relocation < 0 )
+  if ((int) relocation < 0)
     {
-      if (~(int)relocation > max)
+      if (~ (int) relocation > max)
 	flag = bfd_reloc_overflow;
     }
   else
     {
-      if ((int)relocation > max)
+      if ((int) relocation > max)
 	flag = bfd_reloc_overflow;
     }
+
   relocation >>= 3;
   if (howto->bitsize == 6)
     in1 |= ((relocation & (mask >> 12)) << 12);
@@ -473,6 +250,205 @@ bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bf
   return flag;
 }
 
+static reloc_howto_type elf_d30v_howto_table[] =
+{
+  /* This reloc does nothing.  */
+  HOWTO (R_D30V_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_D30V_NONE",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0,			/* Src_mask.  */
+	 0,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A 6 bit absolute relocation.  */
+  HOWTO (R_D30V_6,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 6,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_D30V_6",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3f,			/* Src_mask.  */
+	 0x3f,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 9 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_9_PCREL,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 6,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_9_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3f,			/* Src_mask.  */
+	 0x3f,			/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A relative 9 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_9_PCREL_R,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 6,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_9_PCREL_R",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3f,			/* Src_mask.  */
+	 0x3f,			/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* An absolute 15 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_15,		/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 12,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_D30V_15",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xfff,			/* Src_mask.  */
+	 0xfff,			/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 15 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_15_PCREL,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 12,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_15_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xfff,			/* Src_mask.  */
+	 0xfff,			/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A relative 15 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_15_PCREL_R,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 12,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_15_PCREL_R",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xfff,			/* Src_mask.  */
+	 0xfff,			/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* An absolute 21 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_21,		/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 18,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_generic_reloc,	/* Special_function.  */
+	 "R_D30V_21",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3ffff,		/* Src_mask.  */
+	 0x3ffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 21 bit relocation, right shifted by 3.  */
+  HOWTO (R_D30V_21_PCREL,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 18,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_21_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3ffff,		/* Src_mask.  */
+	 0x3ffff,		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A relative 21 bit relocation, right shifted by 3, in the Right container.  */
+  HOWTO (R_D30V_21_PCREL_R,	/* Type.  */
+	 3,			/* Rightshift.  */
+	 2,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 18,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc_21,	/* Special_function.  */
+	 "R_D30V_21_PCREL_R",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0x3ffff,		/* Src_mask.  */
+	 0x3ffff,		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A D30V 32 bit absolute relocation.  */
+  HOWTO (R_D30V_32,		/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 FALSE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_bitfield, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc,	/* Special_function.  */
+	 "R_D30V_32",		/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Src_mask.  */
+	 0xffffffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+  /* A relative 32 bit relocation.  */
+  HOWTO (R_D30V_32_PCREL,	/* Type.  */
+	 0,			/* Rightshift.  */
+	 4,			/* Size (0 = byte, 1 = short, 2 = long).  */
+	 32,			/* Bitsize.  */
+	 TRUE,			/* PC_relative.  */
+	 0,			/* Bitpos.  */
+	 complain_overflow_signed, /* Complain_on_overflow.  */
+	 bfd_elf_d30v_reloc,	/* Special_function.  */
+	 "R_D30V_32_PCREL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Src_mask.  */
+	 0xffffffff,		/* Dst_mask.  */
+	 TRUE),			/* PCrel_offset.  */
+
+  /* A regular 32 bit absolute relocation.  */
+  HOWTO (R_D30V_32_NORMAL,	/* 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_D30V_32_NORMAL",	/* Name.  */
+	 FALSE,			/* Partial_inplace.  */
+	 0xffffffff,		/* Src_mask.  */
+	 0xffffffff,		/* Dst_mask.  */
+	 FALSE),		/* PCrel_offset.  */
+
+};
+
 /* Map BFD reloc types to D30V ELF reloc types.  */
 
 struct d30v_reloc_map
@@ -499,9 +475,8 @@ static const struct d30v_reloc_map d30v_reloc_map[] =
 };
 
 static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_reloc_code_real_type code;
+bfd_elf32_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+				 bfd_reloc_code_real_type code)
 {
   unsigned int i;
 
@@ -519,10 +494,9 @@ bfd_elf32_bfd_reloc_type_lookup (abfd, code)
 /* Set the howto pointer for an D30V ELF reloc (type REL).  */
 
 static void
-d30v_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *cache_ptr;
-     Elf_Internal_Rela *dst;
+d30v_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+			arelent *cache_ptr,
+			Elf_Internal_Rela *dst)
 {
   unsigned int r_type;
 
@@ -534,10 +508,9 @@ d30v_info_to_howto_rel (abfd, cache_ptr, dst)
 /* Set the howto pointer for an D30V ELF reloc (type RELA).  */
 
 static void
-d30v_info_to_howto_rela (abfd, cache_ptr, dst)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *cache_ptr;
-     Elf_Internal_Rela *dst;
+d30v_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+			 arelent *cache_ptr,
+			 Elf_Internal_Rela *dst)
 {
   unsigned int r_type;