X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Felf32-d30v.c;h=984b4c4fb582ef4e2b489ee07a68fbac426eece7;hb=b643315decd3e566e68ef374a0794371a4bddab3;hp=3976206edff45a62134cdc39d1b1d13e9c6cd75e;hpb=64d2901806c171c0d949f8fb1b29b4e5ba8cf04d;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/elf32-d30v.c b/bfd/elf32-d30v.c
index 3976206edf..984b4c4fb5 100644
--- a/bfd/elf32-d30v.c
+++ b/bfd/elf32-d30v.c
@@ -1,5 +1,5 @@
 /* D30V-specific support for 32-bit ELF
-   Copyright (C) 1997-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-2018 Free Software Foundation, Inc.
    Contributed by Martin Hunt (hunt@cygnus.com).
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -56,7 +56,7 @@ bfd_elf_d30v_reloc (bfd *abfd,
     }
 
   r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
-                             input_section, output_bfd, error_message);
+			     input_section, output_bfd, error_message);
   if (r != bfd_reloc_continue)
     return r;
 
@@ -123,7 +123,7 @@ bfd_elf_d30v_reloc (bfd *abfd,
     }
 
   in1 |= (relocation >> 26) & 0x3F;		/* Top 6 bits.  */
-  in2 |= ((relocation & 0x03FC0000) << 2);  	/* Next 8 bits.  */
+  in2 |= ((relocation & 0x03FC0000) << 2);	/* Next 8 bits.  */
   in2 |= relocation & 0x0003FFFF;		/* Bottom 18 bits.  */
 
   /* Change a PC-relative instruction to its
@@ -164,7 +164,7 @@ bfd_elf_d30v_reloc_21 (bfd *abfd,
     }
 
   r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
-                             input_section, output_bfd, error_message);
+			     input_section, output_bfd, error_message);
   if (r != bfd_reloc_continue)
     return r;
 
@@ -509,7 +509,7 @@ bfd_elf32_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
 /* Set the howto pointer for an D30V ELF reloc (type REL).  */
 
 static void
-d30v_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+d30v_info_to_howto_rel (bfd *abfd,
 			arelent *cache_ptr,
 			Elf_Internal_Rela *dst)
 {
@@ -518,7 +518,9 @@ d30v_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
   r_type = ELF32_R_TYPE (dst->r_info);
   if (r_type >= (unsigned int) R_D30V_max)
     {
-      _bfd_error_handler (_("%B: invalid D30V reloc number: %d"), abfd, r_type);
+      /* xgettext:c-format */
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+			  abfd, r_type);
       r_type = 0;
     }
   cache_ptr->howto = &elf_d30v_howto_table[r_type];
@@ -527,7 +529,7 @@ d30v_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
 /* Set the howto pointer for an D30V ELF reloc (type RELA).  */
 
 static void
-d30v_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
+d30v_info_to_howto_rela (bfd *abfd,
 			 arelent *cache_ptr,
 			 Elf_Internal_Rela *dst)
 {
@@ -536,7 +538,9 @@ d30v_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
   r_type = ELF32_R_TYPE (dst->r_info);
   if (r_type >= (unsigned int) R_D30V_max)
     {
-      _bfd_error_handler (_("%B: invalid D30V reloc number: %d"), abfd, r_type);
+      /* xgettext:c-format */
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+			  abfd, r_type);
       r_type = 0;
     }
   cache_ptr->howto = &elf_d30v_howto_table[r_type];
@@ -547,7 +551,7 @@ d30v_info_to_howto_rela (bfd *abfd ATTRIBUTE_UNUSED,
 #define ELF_MACHINE_ALT1	EM_CYGNUS_D30V
 #define ELF_MAXPAGESIZE		0x1000
 
-#define TARGET_BIG_SYM          d30v_elf32_vec
+#define TARGET_BIG_SYM		d30v_elf32_vec
 #define TARGET_BIG_NAME		"elf32-d30v"
 
 #define elf_info_to_howto	d30v_info_to_howto_rela