Update year range in copyright notice of binutils files

[deliverable/binutils-gdb.git] / bfd / coff-i960.c

diff --git a/bfd/coff-i960.c b/bfd/coff-i960.c
index f7610282cfb2536b5720e11af7131a51229e68bb..8b91bfe1c075594f84d3b29d53c7966f152b494a 100644 (file)
--- a/bfd/coff-i960.c
+++ b/bfd/coff-i960.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Intel 960 COFF files.
-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2018 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -128,7 +128,7 @@ optcall_callback (bfd *abfd,
       {
       case C_LEAFSTAT:
       case C_LEAFEXT:
-       /* This is a call to a leaf procedure, replace instruction with a bal
+       /* This is a call to a leaf procedure, replace instruction with a bal
           to the correct location.  */
        {
          union internal_auxent *aux = &((cs->native+2)->u.auxent);
@@ -142,9 +142,9 @@ optcall_callback (bfd *abfd,
             sym and auxents untouched, so the delta between the two
             is the offset of the bal entry point.  */
          word = ((word +  olf)  & BAL_MASK) | BAL;
-         bfd_put_32 (abfd, (bfd_vma) word,
+         bfd_put_32 (abfd, (bfd_vma) word,
                      (bfd_byte *) data + reloc_entry->address);
-       }
+       }
        result = bfd_reloc_ok;
        break;
       case C_SCALL:
@@ -201,7 +201,7 @@ coff_i960_relocate (bfd *abfd,
   if (bfd_is_com_section (bfd_get_section (symbol)))
     {
       /* I don't really know what the right action is for a common
-         symbol.  */
+        symbol.  */
       return bfd_reloc_continue;
     }
 
@@ -429,7 +429,7 @@ coff_i960_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
          else
            {
              sec = sections[symndx];
-              val = (sec->output_section->vma
+             val = (sec->output_section->vma
                     + sec->output_offset
                     + sym->n_value
                     - sec->vma);
@@ -448,12 +448,9 @@ coff_i960_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
                     + sec->output_offset);
            }
          else if (! bfd_link_relocatable (info))
-           {
-             if (! ((*info->callbacks->undefined_symbol)
-                    (info, h->root.root.string, input_bfd, input_section,
-                     rel->r_vaddr - input_section->vma, TRUE)))
-               return FALSE;
-           }
+           (*info->callbacks->undefined_symbol)
+             (info, h->root.root.string, input_bfd, input_section,
+              rel->r_vaddr - input_section->vma, TRUE);
        }
 
       done = FALSE;
@@ -471,19 +468,18 @@ coff_i960_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
            {
            case C_NULL:
              /* This symbol is apparently not from a COFF input file.
-                 We warn, and then assume that it is not a leaf
-                 function.  */
-             if (! ((*info->callbacks->reloc_dangerous)
-                    (info,
-                     _("uncertain calling convention for non-COFF symbol"),
-                     input_bfd, input_section,
-                     rel->r_vaddr - input_section->vma)))
-               return FALSE;
+                We warn, and then assume that it is not a leaf
+                function.  */
+             (*info->callbacks->reloc_dangerous)
+               (info,
+                _("uncertain calling convention for non-COFF symbol"),
+                input_bfd, input_section,
+                rel->r_vaddr - input_section->vma);
              break;
            case C_LEAFSTAT:
            case C_LEAFEXT:
              /* This is a call to a leaf procedure; use the bal
-                 instruction.  */
+                instruction.  */
              {
                long olf;
                unsigned long word;
@@ -555,11 +551,10 @@ coff_i960_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
                  return FALSE;
              }
 
-           if (! ((*info->callbacks->reloc_overflow)
-                  (info, (h ? &h->root : NULL), name, howto->name,
-                   (bfd_vma) 0, input_bfd, input_section,
-                   rel->r_vaddr - input_section->vma)))
-             return FALSE;
+           (*info->callbacks->reloc_overflow)
+             (info, (h ? &h->root : NULL), name, howto->name,
+              (bfd_vma) 0, input_bfd, input_section,
+              rel->r_vaddr - input_section->vma);
          }
        }
     }