Undo dynamic symbol state after regular object sym type mismatch

[deliverable/binutils-gdb.git] / bfd / elf32-i386.c

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index b1afb49c6a106362f09a8d0b2ce8ce9185e8fb3b..7af68634e64853c548b859a093622d4ec065b888 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1569,8 +1569,8 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
        /* xgettext:c-format */
        (_("%B: TLS transition from %s to %s against `%s' at 0x%lx "
           "in section `%A' failed"),
-        abfd, sec, from->name, to->name, name,
-        (unsigned long) rel->r_offset);
+        abfd, from->name, to->name, name,
+        (unsigned long) rel->r_offset, sec);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
@@ -1655,7 +1655,8 @@ elf_i386_convert_load_reloc (bfd *abfd, Elf_Internal_Shdr *symtab_hdr,
 
       _bfd_error_handler
        /* xgettext:c-format */
-       (_("%B: direct GOT relocation R_386_GOT32X against `%s' without base register can not be used when making a shared object"),
+       (_("%B: direct GOT relocation R_386_GOT32X against `%s' without base"
+          " register can not be used when making a shared object"),
         abfd, name);
       return FALSE;
     }
@@ -3836,7 +3837,7 @@ elf_i386_relocate_section (bfd *output_bfd,
          _bfd_error_handler
            /* xgettext:c-format */
            (_("%B: unrecognized relocation (0x%x) in section `%A'"),
-            input_bfd, input_section, r_type);
+            input_bfd, r_type, input_section);
          bfd_set_error (bfd_error_bad_value);
          return FALSE;
        }
@@ -4367,7 +4368,9 @@ disallow_got32:
 
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: direct GOT relocation %s against `%s' without base register can not be used when making a shared object"),
+                   (_("%B: direct GOT relocation %s against `%s'"
+                      " without base register can not be used"
+                      " when making a shared object"),
                     input_bfd, howto->name, name);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
@@ -4415,7 +4418,8 @@ disallow_got32:
 
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: relocation R_386_GOTOFF against undefined %s `%s' can not be used when making a shared object"),
+                   (_("%B: relocation R_386_GOTOFF against undefined %s"
+                      " `%s' can not be used when making a shared object"),
                     input_bfd, v, h->root.root.string);
                  bfd_set_error (bfd_error_bad_value);
                  return FALSE;
@@ -4427,7 +4431,8 @@ disallow_got32:
                {
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: relocation R_386_GOTOFF against protected %s `%s' can not be used when making a shared object"),
+                   (_("%B: relocation R_386_GOTOFF against protected %s"
+                      " `%s' can not be used when making a shared object"),
                     input_bfd,
                     h->type == STT_FUNC ? "function" : "data",
                     h->root.root.string);
@@ -6147,8 +6152,8 @@ elf_i386_parse_gnu_properties (bfd *abfd, unsigned int type,
        {
          _bfd_error_handler
            ((type == GNU_PROPERTY_X86_ISA_1_USED
-             ? _("error: %B: <corrupt x86 ISA used size: 0x%x>\n")
-             : _("error: %B: <corrupt x86 ISA needed size: 0x%x>\n")),
+             ? _("error: %B: <corrupt x86 ISA used size: 0x%x>")
+             : _("error: %B: <corrupt x86 ISA needed size: 0x%x>")),
             abfd, datasz);
          return property_corrupt;
        }