Fix mmix assembler test to account for changes in the error messages produced by...

[binutils-gdb.git] / bfd / elf32-tic6x.c

diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index a51254a685fc29bb7cefa1e8b31ab55381114788..80ddfaff0bdf961ae9f13835ddcd45315b014c78 100644 (file)
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -1735,11 +1735,9 @@ elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd,
                                   struct elf_link_hash_entry *h,
                                   Elf_Internal_Sym * sym)
 {
-  bfd *dynobj;
   struct elf32_tic6x_link_hash_table *htab;
 
   htab = elf32_tic6x_hash_table (info);
-  dynobj = htab->elf.dynobj;
 
   if (h->plt.offset != (bfd_vma) -1)
     {
@@ -1839,8 +1837,8 @@ elf32_tic6x_finish_dynamic_symbol (bfd * output_bfd,
       /* This symbol has an entry in the global offset table.
          Set it up.  */
 
-      sgot = bfd_get_linker_section (dynobj, ".got");
-      srela = bfd_get_linker_section (dynobj, ".rela.got");
+      sgot = htab->elf.sgot;
+      srela = htab->elf.srelgot;
       BFD_ASSERT (sgot != NULL && srela != NULL);
 
       /* If this is a -Bsymbolic link, and the symbol is defined
@@ -2631,6 +2629,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd,
                 allowed to pass us these kinds of things.  */
              if (h == NULL)
                _bfd_error_handler
+                 /* xgettext:c-format */
                  (_("%B, section %A: relocation %s with non-zero addend %d"
                     " against local symbol"),
                   input_bfd,
@@ -2639,6 +2638,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd,
                   rel->r_addend);
              else
                _bfd_error_handler
+                 /* xgettext:c-format */
                  (_("%B, section %A: relocation %s with non-zero addend %d"
                     " against symbol `%s'"),
                   input_bfd,
@@ -2668,6 +2668,7 @@ elf32_tic6x_relocate_section (bfd *output_bfd,
          /* Invalid in relocatable object.  */
        default:
          /* Unknown relocation.  */
+         /* xgettext:c-format */
          _bfd_error_handler (_("%B: invalid relocation type %d"),
                              input_bfd, r_type);
          ok = FALSE;
@@ -2807,6 +2808,7 @@ elf32_tic6x_check_relocs (bfd *abfd, struct bfd_link_info *info,
 
       if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
        {
+         /* xgettext:c-format */
          _bfd_error_handler (_("%B: bad symbol index: %d"),
                              abfd, r_symndx);
          return FALSE;
@@ -3642,6 +3644,7 @@ elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag)
   if ((tag & 127) < 64)
     {
       _bfd_error_handler
+       /* xgettext:c-format */
        (_("%B: error: unknown mandatory EABI object attribute %d"),
         abfd, tag);
       bfd_set_error (bfd_error_bad_value);
@@ -3650,6 +3653,7 @@ elf32_tic6x_obj_attrs_handle_unknown (bfd *abfd, int tag)
   else
     {
       _bfd_error_handler
+       /* xgettext:c-format */
        (_("%B: warning: unknown EABI object attribute %d"),
         abfd, tag);
       return TRUE;
@@ -3763,6 +3767,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
       < in_attr[Tag_ABI_stack_align_needed].i)
     {
       _bfd_error_handler
+       /* xgettext:c-format */
        (_("error: %B requires more stack alignment than %B preserves"),
         ibfd, obfd);
       result = FALSE;
@@ -3771,6 +3776,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
       < out_attr[Tag_ABI_stack_align_needed].i)
     {
       _bfd_error_handler
+       /* xgettext:c-format */
        (_("error: %B requires more stack alignment than %B preserves"),
         obfd, ibfd);
       result = FALSE;
@@ -3816,6 +3822,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
   if (array_align_out < array_expect_in)
     {
       _bfd_error_handler
+       /* xgettext:c-format */
        (_("error: %B requires more array alignment than %B preserves"),
         ibfd, obfd);
       result = FALSE;
@@ -3823,6 +3830,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
   if (array_align_in < array_expect_out)
     {
       _bfd_error_handler
+       /* xgettext:c-format */
        (_("error: %B requires more array alignment than %B preserves"),
         obfd, ibfd);
       result = FALSE;
@@ -3845,6 +3853,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
              && out_attr[i].i != in_attr[i].i)
            {
              _bfd_error_handler
+               /* xgettext:c-format */
                (_("warning: %B and %B differ in wchar_t size"), obfd, ibfd);
            }
          break;
@@ -3863,6 +3872,7 @@ elf32_tic6x_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
          if (out_attr[i].i != in_attr[i].i)
            {
              _bfd_error_handler
+               /* xgettext:c-format */
                (_("warning: %B and %B differ in whether code is "
                   "compiled for DSBT"),
                 obfd, ibfd);