diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2017-09-22 17:00:33 -0300 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2017-09-22 17:00:33 -0300 |
| commit | 9e0703de64a6dd4deae2ebd569955f14337f2710 (patch) | |
| tree | cec45139f1febef6441deabae142c3fb3f2c61f3 /bfd/elf64-ia64-vms.c | |
| parent | 13b9f79a1904081d984a64037af6457c1e3ff7b6 (diff) | |
| parent | 43573013c9836f2b91b74b9b29dac35fdb41e06b (diff) | |
| download | gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.zip gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.tar.gz gdb-9e0703de64a6dd4deae2ebd569955f14337f2710.tar.bz2 | |
Merge remote-tracking branch 'remotes/master' into users/aoliva/SFN
Updated local changes to binutils/testsuite/binutils-all/readelf.exp
to match the unresolved (failed to assemble) messages introduced by
Alan Modra.
Diffstat (limited to 'bfd/elf64-ia64-vms.c')
| -rw-r--r-- | bfd/elf64-ia64-vms.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c index 4dff255..8140dc5 100644 --- 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; } @@ -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 @@ -3948,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; @@ -3964,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; @@ -5159,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; } |