Rewrite bfd error handler

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

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 5d3a65379c7180cbcfc26a4ed167801410bd29c9..dbbdf891caac1e43ef8116782482babfab8e30f2 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -1702,8 +1702,8 @@ elf_x86_64_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;
     }
@@ -4284,7 +4284,7 @@ elf_x86_64_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;
        }
@@ -5065,18 +5065,16 @@ direct:
                              (_("%B: addend -0x%x in relocation %s against "
                                 "symbol `%s' at 0x%lx in section `%A' is "
                                 "out of range"),
-                              input_bfd, input_section, addend,
-                              howto->name, name,
-                              (unsigned long) rel->r_offset);
+                              input_bfd, addend, howto->name, name,
+                              (unsigned long) rel->r_offset, input_section);
                          else
                            _bfd_error_handler
                              /* xgettext:c-format */
                              (_("%B: addend 0x%x in relocation %s against "
                                 "symbol `%s' at 0x%lx in section `%A' is "
                                 "out of range"),
-                              input_bfd, input_section, addend,
-                              howto->name, name,
-                              (unsigned long) rel->r_offset);
+                              input_bfd, addend, howto->name, name,
+                              (unsigned long) rel->r_offset, input_section);
                          bfd_set_error (bfd_error_bad_value);
                          return FALSE;
                        }