Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / mmo.c

diff --git a/bfd/mmo.c b/bfd/mmo.c
index d396fd742816b13ab7255b9a341e714a8292083c..9e558ec4998b24c638026342c52922237e46ea9e 100644 (file)
--- a/bfd/mmo.c
+++ b/bfd/mmo.c
@@ -463,7 +463,8 @@ mmo_make_section (bfd *abfd, const char *secname)
 
       if (newsecname == NULL)
        {
-         (*_bfd_error_handler)
+         _bfd_error_handler
+           /* xgettext:c-format */
            (_("%s: No core to allocate section name %s\n"),
             bfd_get_filename (abfd), secname);
          bfd_set_error (bfd_error_system_call);
@@ -538,7 +539,8 @@ mmo_object_p (bfd *abfd)
 
   if (abfd->tdata.mmo_data->lop_stab_symbol == NULL)
     {
-      (*_bfd_error_handler)
+      _bfd_error_handler
+       /* xgettext:c-format */
        (_("%s: No core to allocate a symbol %d bytes long\n"),
         bfd_get_filename (abfd), abfd->tdata.mmo_data->max_symbol_length);
       goto bad_final;
@@ -951,7 +953,8 @@ mmo_write_loc_chunk (bfd *abfd, bfd_vma vma, const bfd_byte *loc,
         group-wise aligned.  */
       if ((vma & 3) != 0)
        {
-         (*_bfd_error_handler)
+         _bfd_error_handler
+           /* xgettext:c-format */
            (_("%s: attempt to emit contents at non-multiple-of-4 address 0x%lx\n"),
             bfd_get_filename (abfd), (unsigned long) vma);
          bfd_set_error (bfd_error_bad_value);
@@ -1247,7 +1250,7 @@ mmo_create_symbol (bfd *abfd, const char *symname, bfd_vma addr, enum
       && bfd_get_start_address (abfd) != addr
       && !mmo_ignore_symbol_consistency (abfd))
     {
-      (*_bfd_error_handler)
+      _bfd_error_handler
        (_("%s: invalid mmo file: initialization value for $255 is not `Main'\n"),
         bfd_get_filename (abfd));
       bfd_set_error (bfd_error_bad_value);
@@ -1392,7 +1395,8 @@ SUBSECTION
              abfd->tdata.mmo_data->lop_stab_symbol
                [abfd->tdata.mmo_data->symbol_position] = 0;
 
-             (*_bfd_error_handler)
+             _bfd_error_handler
+               /* xgettext:c-format */
                (_("%s: unsupported wide character sequence"
                   " 0x%02X 0x%02X after symbol name starting with `%s'\n"),
                 bfd_get_filename (abfd), c, c2,
@@ -1626,7 +1630,8 @@ mmo_scan (bfd *abfd)
          switch (buf[1])
            {
            default:
-             (*_bfd_error_handler)
+             _bfd_error_handler
+               /* xgettext:c-format */
                (_("%s: invalid mmo file: unsupported lopcode `%d'\n"),
                 bfd_get_filename (abfd), buf[1]);
              bfd_set_error (bfd_error_bad_value);
@@ -1636,7 +1641,8 @@ mmo_scan (bfd *abfd)
              /* Quote the next 32-bit word.  */
              if (y != 0 || z != 1)
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%s: invalid mmo file: expected YZ = 1 got YZ = %d for lop_quote\n"),
                     bfd_get_filename (abfd), y*256+z);
                  bfd_set_error (bfd_error_bad_value);
@@ -1672,7 +1678,8 @@ mmo_scan (bfd *abfd)
                }
              else
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_loc\n"),
                     bfd_get_filename (abfd), z);
                  bfd_set_error (bfd_error_bad_value);
@@ -1721,7 +1728,8 @@ mmo_scan (bfd *abfd)
                  }
                else
                  {
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("%s: invalid mmo file: expected z = 1 or z = 2, got z = %d for lop_fixo\n"),
                       bfd_get_filename (abfd), z);
                    bfd_set_error (bfd_error_bad_value);
@@ -1760,7 +1768,8 @@ mmo_scan (bfd *abfd)
 
                if (y != 0)
                  {
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("%s: invalid mmo file: expected y = 0, got y = %d for lop_fixrx\n"),
                       bfd_get_filename (abfd), y);
                    bfd_set_error (bfd_error_bad_value);
@@ -1769,7 +1778,8 @@ mmo_scan (bfd *abfd)
 
                if (z != 16 && z != 24)
                  {
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("%s: invalid mmo file: expected z = 16 or z = 24, got z = %d for lop_fixrx\n"),
                       bfd_get_filename (abfd), z);
                    bfd_set_error (bfd_error_bad_value);
@@ -1792,7 +1802,8 @@ mmo_scan (bfd *abfd)
                  p = vma - 4 * ((delta & 0xffffff) - (1 << z));
                else
                  {
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("%s: invalid mmo file: leading byte of operand word must be 0 or 1, got %d for lop_fixrx\n"),
                       bfd_get_filename (abfd), buf[0]);
                    bfd_set_error (bfd_error_bad_value);
@@ -1815,7 +1826,8 @@ mmo_scan (bfd *abfd)
 
                  if (fname == NULL)
                    {
-                     (*_bfd_error_handler)
+                     _bfd_error_handler
+                       /* xgettext:c-format */
                        (_("%s: cannot allocate file name for file number %d, %d bytes\n"),
                         bfd_get_filename (abfd), y, z * 4 + 1);
                      bfd_set_error (bfd_error_system_call);
@@ -1835,7 +1847,8 @@ mmo_scan (bfd *abfd)
 
                  if (file_names[y] != NULL)
                    {
-                     (*_bfd_error_handler)
+                     _bfd_error_handler
+                       /* xgettext:c-format */
                        (_("%s: invalid mmo file: file number %d `%s',"
                           " was already entered as `%s'\n"),
                         bfd_get_filename (abfd), y, fname, file_names[y]);
@@ -1848,7 +1861,8 @@ mmo_scan (bfd *abfd)
 
              if (file_names[y] == NULL)
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%s: invalid mmo file: file name for number %d"
                       " was not specified before use\n"),
                     bfd_get_filename (abfd), y);
@@ -1954,7 +1968,8 @@ mmo_scan (bfd *abfd)
              /* We read in the symbols now, not later.  */
              if (y != 0 || z != 0)
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%s: invalid mmo file: fields y and z of lop_stab"
                       " non-zero, y: %d, z: %d\n"),
                     bfd_get_filename (abfd), y, z);
@@ -1990,7 +2005,8 @@ mmo_scan (bfd *abfd)
 
                if (statbuf.st_size != curpos)
                  {
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("%s: invalid mmo file: lop_end not last item in"
                         " file\n"),
                       bfd_get_filename (abfd));
@@ -2003,7 +2019,8 @@ mmo_scan (bfd *abfd)
                   it.  */
                if ((long) (y * 256 + z) * 4 != (curpos - stab_loc) - 4)
                  {
-                   (*_bfd_error_handler)
+                   _bfd_error_handler
+                     /* xgettext:c-format */
                      (_("%s: invalid mmo file: YZ of lop_end (%ld)"
                         " not equal to the number of tetras to the preceding"
                         " lop_stab (%ld)\n"),
@@ -2120,7 +2137,7 @@ mmo_get_section_contents (bfd *abfd ATTRIBUTE_UNUSED,
 
       memcpy (location, loc, chunk_size);
 
-      location += chunk_size;
+      location = (bfd_byte *) location + chunk_size;
       bytes_to_do -= chunk_size;
       offset += chunk_size;
     }
@@ -2657,7 +2674,7 @@ mmo_set_section_contents (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
 
       memcpy (loc, location, chunk_size);
 
-      location += chunk_size;
+      location = (bfd_byte *) location + chunk_size;
       bytes_to_do -= chunk_size;
       offset += chunk_size;
     }
@@ -2713,7 +2730,8 @@ mmo_internal_add_3_sym (bfd *abfd, struct mmo_symbol_trie *rootp,
      we discover it and bail out.  */
   if (trie->sym.name != NULL)
     {
-      (*_bfd_error_handler)
+      _bfd_error_handler
+       /* xgettext:c-format */
        (_("%s: invalid symbol table: duplicate symbol `%s'\n"),
         bfd_get_filename (abfd), trie->sym.name);
       bfd_set_error (bfd_error_bad_value);
@@ -2955,7 +2973,8 @@ mmo_write_symbols_and_terminator (bfd *abfd)
            sprintf_vma (vmas_main, mainvalue);
            sprintf_vma (vmas_start, vma_start);
 
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: Bad symbol definition: `Main' set to %s rather"
                 " than the start address %s\n"),
               bfd_get_filename (abfd), vmas_main, vmas_start);
@@ -3053,7 +3072,8 @@ mmo_write_symbols_and_terminator (bfd *abfd)
         There's no specific test-case.  */
       struct mmo_symbol sym;
 
-      (*_bfd_error_handler)
+      _bfd_error_handler
+       /* xgettext:c-format */
        (_("%s: warning: symbol table too large for mmo, larger than 65535"
           " 32-bit words: %d.  Only `Main' will be emitted.\n"),
         bfd_get_filename (abfd), trie_len);
@@ -3098,7 +3118,8 @@ mmo_write_symbols_and_terminator (bfd *abfd)
       /* I haven't seen this trig.  It seems no use claiming this case
         isn't debugged and abort if we get here.  Instead emit a
         diagnostic and fail "normally".  */
-      (*_bfd_error_handler)
+      _bfd_error_handler
+       /* xgettext:c-format */
        (_("%s: internal error, symbol table changed size from %d to %d"
           " words\n"),
         bfd_get_filename (abfd), trie_len,
@@ -3150,7 +3171,8 @@ mmo_write_section_unless_reg_contents (bfd *abfd, asection *sec, void *p)
          /* Make sure it hasn't got contents.  It seems impossible to
             make it carry contents, so we don't have a test-case for
             this.  */
-         (*_bfd_error_handler)
+         _bfd_error_handler
+           /* xgettext:c-format */
            (_("%s: internal error, internal register section %s had"
               " contents\n"),
             bfd_get_filename (abfd), sec->name);
@@ -3201,18 +3223,20 @@ mmo_write_object_contents (bfd *abfd)
 
          if (sec->size == 0)
            /* There must always be at least one such register.  */
-           (*_bfd_error_handler)
+           _bfd_error_handler
              (_("%s: no initialized registers; section length 0\n"),
               bfd_get_filename (abfd));
          else if (sec->vma > (256 - 32) * 8)
            /* Provide better error message for the case of too many
               global registers.  */
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: too many initialized registers; section length %ld\n"),
               bfd_get_filename (abfd),
               (long) sec->size);
          else
-           (*_bfd_error_handler)
+           _bfd_error_handler
+             /* xgettext:c-format */
              (_("%s: invalid start address for initialized registers of"
                 " length %ld: 0x%lx%08lx\n"),
               bfd_get_filename (abfd),
@@ -3278,6 +3302,7 @@ mmo_write_object_contents (bfd *abfd)
   _bfd_generic_copy_link_hash_symbol_type
 #define mmo_bfd_final_link _bfd_generic_final_link
 #define mmo_bfd_link_split_section _bfd_generic_link_split_section
+#define mmo_bfd_link_check_relocs  _bfd_generic_link_check_relocs
 
 /* Strictly speaking, only MMIX uses this restricted format, but let's not
    stop anybody from shooting themselves in the foot.  */