Automatic date update in version.in

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

diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c
index 4d35a5dcc4b49572fb93fce65a5871be2af22bd8..8140dc5f3ad6fee2e6da91d498e1bfc8b258a0fd 100644 (file)
--- a/bfd/elf64-ia64-vms.c
+++ b/bfd/elf64-ia64-vms.c
@@ -584,9 +584,9 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec,
            {
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B: Can't relax br at 0x%lx in section `%A'."
+               (_("%B: Can't relax br at %#Lx in section `%A'."
                   " Please use brl or indirect branch."),
-                sec->owner, (unsigned long) roff, sec);
+                sec->owner, roff, sec);
              bfd_set_error (bfd_error_bad_value);
              goto error_return;
            }
@@ -2099,7 +2099,7 @@ elf64_ia64_check_relocs (bfd *abfd, struct bfd_link_info *info,
 
          /* 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;
          h->ref_regular = 1;
        }
       else
@@ -3279,8 +3279,8 @@ elf64_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final)
 overflow:
          _bfd_error_handler
            /* xgettext:c-format */
-           (_("%B: short data segment overflowed (0x%lx >= 0x400000)"),
-            abfd, (unsigned long) (max_short_vma - min_short_vma));
+           (_("%B: short data segment overflowed (%#Lx >= 0x400000)"),
+            abfd, max_short_vma - min_short_vma);
          return FALSE;
        }
       else if ((gp_val > min_short_vma
@@ -3555,7 +3555,8 @@ elf64_ia64_relocate_section (bfd *output_bfd,
                     shared libraries nor dynamic executables.  */
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B: non-pic code with imm relocation against dynamic symbol `%s'"),
+                   (_("%B: non-pic code with imm relocation against"
+                      " dynamic symbol `%s'"),
                     input_bfd,
                     h ? h->root.root.string
                       : bfd_elf_sym_name (input_bfd, symtab_hdr, sym,
@@ -3947,7 +3948,7 @@ elf64_ia64_relocate_section (bfd *output_bfd,
                _bfd_error_handler
                  /* xgettext:c-format */
                  (_("%B: missing TLS section for relocation %s against `%s'"
-                    " at 0x%lx in section `%A'."),
+                    " at %#Lx in section `%A'."),
                   input_bfd, howto->name, name,
                   rel->r_offset, input_section);
                break;
@@ -3963,8 +3964,8 @@ elf64_ia64_relocate_section (bfd *output_bfd,
                       that the section is too big to relax.  */
                    _bfd_error_handler
                      /* xgettext:c-format */
-                     (_("%B: Can't relax br (%s) to `%s' at 0x%lx in section"
-                        " `%A' with size 0x%lx (> 0x1000000)."),
+                     (_("%B: Can't relax br (%s) to `%s' at %#Lx in section"
+                        " `%A' with size %#Lx (> 0x1000000)."),
                       input_bfd, howto->name, name, rel->r_offset,
                       input_section, input_section->size);
                    break;
@@ -5158,9 +5159,8 @@ error_free_dyn:
                _bfd_error_handler
                  /* xgettext:c-format */
                  (_("Warning: size of symbol `%s' changed"
-                    " from %lu in %B to %lu in %B"),
-                  name, (unsigned long) h->size, old_bfd,
-                  (unsigned long) isym->st_size, abfd);
+                    " from %Lu in %B to %Lu in %B"),
+                  name, h->size, old_bfd, isym->st_size, abfd);
 
              h->size = isym->st_size;
            }