x86-64: Don't pass output_bfd to info->callbacks->minfo

[binutils-gdb.git] / bfd / elf32-m68k.c

diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index af3f02f2617d8d66d5303a4abab44bc370c6c0ba..ab122feb8b886887d54b8593d1be041295f38bf3 100644 (file)
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -1,5 +1,5 @@
 /* Motorola 68k series support for 32-bit ELF
-   Copyright (C) 1993-2016 Free Software Foundation, Inc.
+   Copyright (C) 1993-2017 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -703,7 +703,7 @@ struct elf_m68k_got_entry
     struct
     {
       /* Offset from the start of .got section.  To calculate offset relative
-        to GOT pointer one should substract got->offset from this value.  */
+        to GOT pointer one should subtract got->offset from this value.  */
       bfd_vma offset;
 
       /* Pointer to the next GOT entry for this global symbol.
@@ -2353,7 +2353,7 @@ elf_m68k_partition_multi_got_1 (void **_entry, void *_arg)
   if (diff != NULL)
     elf_m68k_clear_got (diff);
 
-  return arg->error_p == FALSE ? 1 : 0;
+  return !arg->error_p;
 }
 
 /* Helper function to build symndx2h mapping.  */
@@ -2590,7 +2590,7 @@ elf_m68k_check_relocs (bfd *abfd,
 
          /* PR15323, ref flags aren't set for references in the same
             object.  */
-         h->root.non_ir_ref = 1;
+         h->root.non_ir_ref_regular = 1;
        }
 
       switch (ELF32_R_TYPE (rel->r_info))
@@ -3887,9 +3887,8 @@ elf_m68k_relocate_section (bfd *output_bfd,
            {
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B(%A+0x%lx): R_68K_TLS_LE32 relocation not permitted "
-                  "in shared object"),
-                input_bfd, input_section, (long) rel->r_offset, howto->name);
+               (_("%B(%A+%#Lx): %s relocation not permitted in shared object"),
+                input_bfd, input_section, rel->r_offset, howto->name);
 
              return FALSE;
            }
@@ -4081,10 +4080,10 @@ elf_m68k_relocate_section (bfd *output_bfd,
        {
          _bfd_error_handler
            /* xgettext:c-format */
-           (_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
+           (_("%B(%A+%#Lx): unresolvable %s relocation against symbol `%s'"),
             input_bfd,
             input_section,
-            (long) rel->r_offset,
+            rel->r_offset,
             howto->name,
             h->root.root.string);
          return FALSE;
@@ -4117,12 +4116,12 @@ elf_m68k_relocate_section (bfd *output_bfd,
              _bfd_error_handler
                ((sym_type == STT_TLS
                  /* xgettext:c-format */
-                 ? _("%B(%A+0x%lx): %s used with TLS symbol %s")
+                 ? _("%B(%A+%#Lx): %s used with TLS symbol %s")
                  /* xgettext:c-format */
-                 : _("%B(%A+0x%lx): %s used with non-TLS symbol %s")),
+                 : _("%B(%A+%#Lx): %s used with non-TLS symbol %s")),
                 input_bfd,
                 input_section,
-                (long) rel->r_offset,
+                rel->r_offset,
                 howto->name,
                 name);
            }
@@ -4157,9 +4156,9 @@ elf_m68k_relocate_section (bfd *output_bfd,
            {
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B(%A+0x%lx): reloc against `%s': error %d"),
+               (_("%B(%A+%#Lx): reloc against `%s': error %d"),
                 input_bfd, input_section,
-                (long) rel->r_offset, name, (int) r);
+                rel->r_offset, name, (int) r);
              return FALSE;
            }
        }