Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / elf64-sparc.c

diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
index 3e0772d5d585306584ed938a1d781c76cf32a2c9..089636fb545a789c9c38d82504004fad314bcfcb 100644 (file)
--- a/bfd/elf64-sparc.c
+++ b/bfd/elf64-sparc.c
@@ -1,5 +1,5 @@
 /* SPARC-specific support for 64-bit ELF
-   Copyright (C) 1993-2017 Free Software Foundation, Inc.
+   Copyright (C) 1993-2018 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -100,8 +100,8 @@ elf64_sparc_slurp_one_reloc_table (bfd *abfd, asection *asect,
       if (ELF64_R_SYM (rela.r_info) == STN_UNDEF
          /* PR 17512: file: 996185f8.  */
          || (!dynamic && ELF64_R_SYM(rela.r_info) > bfd_get_symcount(abfd))
-          || (dynamic
-              && ELF64_R_SYM(rela.r_info) > bfd_get_dynamic_symcount(abfd)))
+         || (dynamic
+             && ELF64_R_SYM(rela.r_info) > bfd_get_dynamic_symcount(abfd)))
        relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
       else
        {
@@ -282,9 +282,9 @@ elf64_sparc_canonicalize_dynamic_reloc (bfd *abfd, arelent **storage,
 
 static void
 elf64_sparc_set_reloc (bfd *abfd ATTRIBUTE_UNUSED,
-                       asection *asect,
-                       arelent **location,
-                       unsigned int count)
+                      asection *asect,
+                      arelent **location,
+                      unsigned int count)
 {
   asect->orelocation = location;
   canon_reloc_count (asect) = count;
@@ -457,20 +457,20 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
        case 6: reg -= 4; break;
        default:
          _bfd_error_handler
-            (_("%B: Only registers %%g[2367] can be declared using STT_REGISTER"),
-             abfd);
+           (_("%B: Only registers %%g[2367] can be declared using STT_REGISTER"),
+            abfd);
          return FALSE;
        }
 
       if (info->output_bfd->xvec != abfd->xvec
          || (abfd->flags & DYNAMIC) != 0)
-        {
+       {
          /* STT_REGISTER only works when linking an elf64_sparc object.
             If STT_REGISTER comes from a dynamic object, don't put it into
             the output bfd.  The dynamic linker will recheck it.  */
          *namep = NULL;
          return TRUE;
-        }
+       }
 
       p = _bfd_sparc_elf_hash_table(info)->app_regs + reg;
 
@@ -678,7 +678,7 @@ elf64_sparc_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
   else if (new_flags == old_flags)      /* Compatible flags are ok */
     ;
 
-  else                                  /* Incompatible flags */
+  else                                 /* Incompatible flags */
     {
       error = FALSE;
 
@@ -720,21 +720,21 @@ elf64_sparc_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 
       /* Warn about any other mismatches */
       if (new_flags != old_flags)
-        {
-          error = TRUE;
+       {
+         error = TRUE;
          _bfd_error_handler
            /* xgettext:c-format */
-            (_("%B: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
-             ibfd, (long) new_flags, (long) old_flags);
-        }
+           (_("%B: uses different e_flags (%#x) fields than previous modules (%#x)"),
+            ibfd, new_flags, old_flags);
+       }
 
       elf_elfheader (obfd)->e_flags = old_flags;
 
       if (error)
-        {
-          bfd_set_error (bfd_error_bad_value);
-          return FALSE;
-        }
+       {
+         bfd_set_error (bfd_error_bad_value);
+         return FALSE;
+       }
     }
   return _bfd_sparc_elf_merge_private_bfd_data (ibfd, info);
 }
@@ -777,8 +777,8 @@ elf64_sparc_print_symbol_all (bfd *abfd ATTRIBUTE_UNUSED, void * filep,
   fprintf (file, "REG_%c%c%11s%c%c    R", "GOLI" [reg / 8], '0' + (reg & 7), "",
                 ((type & BSF_LOCAL)
                  ? (type & BSF_GLOBAL) ? '!' : 'l'
-                 : (type & BSF_GLOBAL) ? 'g' : ' '),
-                (type & BSF_WEAK) ? 'w' : ' ');
+                 : (type & BSF_GLOBAL) ? 'g' : ' '),
+                (type & BSF_WEAK) ? 'w' : ' ');
   if (symbol->name == NULL || symbol->name [0] == '\0')
     return "#scratch";
   else
@@ -929,8 +929,6 @@ const struct elf_size_info elf64_sparc_size_info =
   _bfd_sparc_elf_object_p
 #define elf_backend_gc_mark_hook \
   _bfd_sparc_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook \
-  _bfd_sparc_elf_gc_sweep_hook
 #define elf_backend_init_index_section \
   _bfd_elf_init_1_index_section