X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Felf64-ia64-vms.c;h=5dd83a3ccaf426e5fcdd1bb1dabad8be96d331fd;hb=e15c3eb45bdc8bd5717fd5ceddcc30c3de07b58f;hp=56c110314e693555f5411c2efcc4be8605a533c6;hpb=1a72702bb30ec3f94627cfcae684823b413f20b9;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/elf64-ia64-vms.c b/bfd/elf64-ia64-vms.c index 56c110314e..5dd83a3cca 100644 --- a/bfd/elf64-ia64-vms.c +++ b/bfd/elf64-ia64-vms.c @@ -1,5 +1,5 @@ /* IA-64 support for OpenVMS - Copyright (C) 1998-2016 Free Software Foundation, Inc. + Copyright (C) 1998-2017 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -582,9 +582,11 @@ elf64_ia64_relax_section (bfd *abfd, asection *sec, if (strcmp (sec->output_section->name, ".init") == 0 || strcmp (sec->output_section->name, ".fini") == 0) { - (*_bfd_error_handler) - (_("%B: Can't relax br at 0x%lx in section `%A'. Please use brl or indirect branch."), - sec->owner, sec, (unsigned long) roff); + _bfd_error_handler + /* xgettext:c-format */ + (_("%B: Can't relax br at 0x%lx in section `%A'." + " Please use brl or indirect branch."), + sec->owner, (unsigned long) roff, sec); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -3275,10 +3277,10 @@ elf64_ia64_choose_gp (bfd *abfd, struct bfd_link_info *info, bfd_boolean final) if (max_short_vma - min_short_vma >= 0x400000) { overflow: - (*_bfd_error_handler) - (_("%s: short data segment overflowed (0x%lx >= 0x400000)"), - bfd_get_filename (abfd), - (unsigned long) (max_short_vma - min_short_vma)); + _bfd_error_handler + /* xgettext:c-format */ + (_("%B: short data segment overflowed (0x%lx >= 0x400000)"), + abfd, (unsigned long) (max_short_vma - min_short_vma)); return FALSE; } else if ((gp_val > min_short_vma @@ -3286,9 +3288,8 @@ overflow: || (gp_val < max_short_vma && max_short_vma - gp_val >= 0x200000)) { - (*_bfd_error_handler) - (_("%s: __gp does not cover short data segment"), - bfd_get_filename (abfd)); + _bfd_error_handler + (_("%B: __gp does not cover short data segment"), abfd); return FALSE; } } @@ -3425,7 +3426,8 @@ elf64_ia64_relocate_section (bfd *output_bfd, r_type = ELF64_R_TYPE (rel->r_info); if (r_type > R_IA64_MAX_RELOC_CODE) { - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("%B: unknown relocation type %d"), input_bfd, (int) r_type); bfd_set_error (bfd_error_bad_value); @@ -3551,8 +3553,10 @@ elf64_ia64_relocate_section (bfd *output_bfd, case R_IA64_IMM64: /* ??? People shouldn't be doing non-pic code in shared libraries nor dynamic executables. */ - (*_bfd_error_handler) - (_("%B: non-pic code with imm relocation against dynamic symbol `%s'"), + _bfd_error_handler + /* xgettext:c-format */ + (_("%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, @@ -3613,7 +3617,8 @@ elf64_ia64_relocate_section (bfd *output_bfd, case R_IA64_GPREL64LSB: if (dynamic_symbol_p) { - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("%B: @gprel relocation against dynamic symbol %s"), input_bfd, h ? h->root.root.string @@ -3672,7 +3677,7 @@ elf64_ia64_relocate_section (bfd *output_bfd, dynamic symbol table. */ /* ??? People shouldn't be doing non-pic code in shared libraries. Hork. */ - (*_bfd_error_handler) + _bfd_error_handler (_("%B: linking non-pic code in a position independent executable"), input_bfd); ret_val = FALSE; @@ -3774,17 +3779,20 @@ elf64_ia64_relocate_section (bfd *output_bfd, const char *msg; if (r_type == R_IA64_PCREL21BI) + /* xgettext:c-format */ msg = _("%B: @internal branch to dynamic symbol %s"); else if (r_type == R_IA64_PCREL21F || r_type == R_IA64_PCREL21M) + /* xgettext:c-format */ msg = _("%B: speculation fixup to dynamic symbol %s"); else + /* xgettext:c-format */ msg = _("%B: @pcrel relocation against dynamic symbol %s"); - (*_bfd_error_handler) (msg, input_bfd, - h ? h->root.root.string - : bfd_elf_sym_name (input_bfd, - symtab_hdr, - sym, - sym_sec)); + _bfd_error_handler (msg, input_bfd, + h ? h->root.root.string + : bfd_elf_sym_name (input_bfd, + symtab_hdr, + sym, + sym_sec)); ret_val = FALSE; continue; } @@ -3937,10 +3945,12 @@ elf64_ia64_relocate_section (bfd *output_bfd, case R_IA64_LTOFF_TPREL22: case R_IA64_LTOFF_DTPMOD22: case R_IA64_LTOFF_DTPREL22: - (*_bfd_error_handler) - (_("%B: missing TLS section for relocation %s against `%s' at 0x%lx in section `%A'."), - input_bfd, input_section, howto->name, name, - rel->r_offset); + _bfd_error_handler + /* xgettext:c-format */ + (_("%B: missing TLS section for relocation %s against `%s'" + " at 0x%lx in section `%A'."), + input_bfd, howto->name, name, + rel->r_offset, input_section); break; case R_IA64_PCREL21B: @@ -3952,12 +3962,15 @@ elf64_ia64_relocate_section (bfd *output_bfd, /* Relaxtion is always performed for ELF output. Overflow failures for those relocations mean that the section is too big to relax. */ - (*_bfd_error_handler) - (_("%B: Can't relax br (%s) to `%s' at 0x%lx in section `%A' with size 0x%lx (> 0x1000000)."), - input_bfd, input_section, howto->name, name, - rel->r_offset, input_section->size); + _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)."), + input_bfd, howto->name, name, rel->r_offset, + input_section, input_section->size); break; } + /* Fall through. */ default: (*info->callbacks->reloc_overflow) (info, &h->root, @@ -4201,8 +4214,9 @@ elf64_ia64_set_private_flags (bfd *abfd, flagword flags) /* Merge backend specific data from an object file to the output object file when linking. */ static bfd_boolean -elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) +elf64_ia64_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) { + bfd *obfd = info->output_bfd; flagword out_flags; flagword in_flags; bfd_boolean ok = TRUE; @@ -4240,7 +4254,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) if ((in_flags & EF_IA_64_TRAPNIL) != (out_flags & EF_IA_64_TRAPNIL)) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: linking trap-on-NULL-dereference with non-trapping files"), ibfd); @@ -4249,7 +4263,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) } if ((in_flags & EF_IA_64_BE) != (out_flags & EF_IA_64_BE)) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: linking big-endian files with little-endian files"), ibfd); @@ -4258,7 +4272,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) } if ((in_flags & EF_IA_64_ABI64) != (out_flags & EF_IA_64_ABI64)) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: linking 64-bit files with 32-bit files"), ibfd); @@ -4267,7 +4281,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) } if ((in_flags & EF_IA_64_CONS_GP) != (out_flags & EF_IA_64_CONS_GP)) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: linking constant-gp files with non-constant-gp files"), ibfd); @@ -4277,7 +4291,7 @@ elf64_ia64_merge_private_bfd_data (bfd *ibfd, bfd *obfd) if ((in_flags & EF_IA_64_NOFUNCDESC_CONS_GP) != (out_flags & EF_IA_64_NOFUNCDESC_CONS_GP)) { - (*_bfd_error_handler) + _bfd_error_handler (_("%B: linking auto-pic files with non-auto-pic files"), ibfd); @@ -5119,17 +5133,19 @@ error_free_dyn: { /* PR binutils/2735 */ if (normal_bfd == NULL) - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("Warning: alignment %u of common symbol `%s' in %B" " is greater than the alignment (%u) of its section %A"), - common_bfd, h->root.u.def.section, - 1 << common_align, name, 1 << normal_align); + 1 << common_align, name, common_bfd, + 1 << normal_align, h->root.u.def.section); else - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("Warning: alignment %u of symbol `%s' in %B" " is smaller than %u in %B"), - normal_bfd, common_bfd, - 1 << normal_align, name, 1 << common_align); + 1 << normal_align, name, normal_bfd, + 1 << common_align, common_bfd); } } @@ -5140,12 +5156,12 @@ error_free_dyn: if (h->size != 0 && h->size != isym->st_size && ! size_change_ok) - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("Warning: size of symbol `%s' changed" " from %lu in %B to %lu in %B"), - old_bfd, abfd, - name, (unsigned long) h->size, - (unsigned long) isym->st_size); + name, (unsigned long) h->size, old_bfd, + (unsigned long) isym->st_size, abfd); h->size = isym->st_size; } @@ -5167,10 +5183,11 @@ error_free_dyn: if (h->type != type) { if (h->type != STT_NOTYPE && ! type_change_ok) - (*_bfd_error_handler) + _bfd_error_handler + /* xgettext:c-format */ (_("Warning: type of symbol `%s' changed" " from %d to %d in %B"), - abfd, name, h->type, type); + name, h->type, type, abfd); h->type = type; }