Automatic date update in version.in

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

diff --git a/bfd/ihex.c b/bfd/ihex.c
index 8d3590d670e9c34a2a98642f31fdac9ebea739f1..6dda98fd2994cfba36a6c0daddc5a92ee6713e88 100644 (file)
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Intel Hex objects.
-   Copyright (C) 1995-2014 Free Software Foundation, Inc.
+   Copyright (C) 1995-2017 Free Software Foundation, Inc.
    Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -219,13 +219,14 @@ ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error)
       char buf[10];
 
       if (! ISPRINT (c))
-       sprintf (buf, "\\%03o", (unsigned int) c);
+       sprintf (buf, "\\%03o", (unsigned int) c & 0xff);
       else
        {
          buf[0] = c;
          buf[1] = '\0';
        }
-      (*_bfd_error_handler)
+      _bfd_error_handler
+       /* xgettext:c-format */
        (_("%B:%d: unexpected character `%s' in Intel Hex file"),
         abfd, lineno, buf);
       bfd_set_error (bfd_error_bad_value);
@@ -276,7 +277,7 @@ ihex_scan (bfd *abfd)
       else
        {
          file_ptr pos;
-         char hdr[8];
+         unsigned char hdr[8];
          unsigned int i;
          unsigned int len;
          bfd_vma addr;
@@ -321,7 +322,7 @@ ihex_scan (bfd *abfd)
            {
              if (! ISHEX (buf[i]))
                {
-                 ihex_bad_byte (abfd, lineno, hdr[i], error);
+                 ihex_bad_byte (abfd, lineno, buf[i], error);
                  goto error_return;
                }
            }
@@ -332,7 +333,8 @@ ihex_scan (bfd *abfd)
            chksum += HEX2 (buf + 2 * i);
          if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
            {
-             (*_bfd_error_handler)
+             _bfd_error_handler
+               /* xgettext:c-format */
                (_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
                 abfd, lineno,
                 (- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
@@ -387,7 +389,8 @@ ihex_scan (bfd *abfd)
              /* An extended address record.  */
              if (len != 2)
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%B:%u: bad extended address record length in Intel Hex file"),
                     abfd, lineno);
                  bfd_set_error (bfd_error_bad_value);
@@ -404,7 +407,8 @@ ihex_scan (bfd *abfd)
              /* An extended start address record.  */
              if (len != 4)
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%B:%u: bad extended start address length in Intel Hex file"),
                     abfd, lineno);
                  bfd_set_error (bfd_error_bad_value);
@@ -421,7 +425,8 @@ ihex_scan (bfd *abfd)
              /* An extended linear address record.  */
              if (len != 2)
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%B:%u: bad extended linear address record length in Intel Hex file"),
                     abfd, lineno);
                  bfd_set_error (bfd_error_bad_value);
@@ -438,7 +443,8 @@ ihex_scan (bfd *abfd)
              /* An extended linear start address record.  */
              if (len != 2 && len != 4)
                {
-                 (*_bfd_error_handler)
+                 _bfd_error_handler
+                   /* xgettext:c-format */
                    (_("%B:%u: bad extended linear start address length in Intel Hex file"),
                     abfd, lineno);
                  bfd_set_error (bfd_error_bad_value);
@@ -455,7 +461,8 @@ ihex_scan (bfd *abfd)
              break;
 
            default:
-             (*_bfd_error_handler)
+             _bfd_error_handler
+               /* xgettext:c-format */
                (_("%B:%u: unrecognized ihex type %u in Intel Hex file"),
                 abfd, lineno, type);
              bfd_set_error (bfd_error_bad_value);
@@ -553,7 +560,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
   error = FALSE;
   while ((c = ihex_get_byte (abfd, &error)) != EOF)
     {
-      char hdr[8];
+      unsigned char hdr[8];
       unsigned int len;
       unsigned int type;
       unsigned int i;
@@ -574,7 +581,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
       /* We should only see type 0 records here.  */
       if (type != 0)
        {
-         (*_bfd_error_handler)
+         _bfd_error_handler
            (_("%B: internal error in ihex_read_section"), abfd);
          bfd_set_error (bfd_error_bad_value);
          goto error_return;
@@ -608,7 +615,7 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
 
   if ((bfd_size_type) (p - contents) < section->size)
     {
-      (*_bfd_error_handler)
+      _bfd_error_handler
        (_("%B: bad section length in ihex_read_section"), abfd);
       bfd_set_error (bfd_error_bad_value);
       goto error_return;
@@ -821,9 +828,10 @@ ihex_write_object_contents (bfd *abfd)
                      char buf[20];
 
                      sprintf_vma (buf, where);
-                     (*_bfd_error_handler)
-                       (_("%s: address 0x%s out of range for Intel Hex file"),
-                        bfd_get_filename (abfd), buf);
+                     _bfd_error_handler
+                       /* xgettext:c-format */
+                       (_("%B: address 0x%s out of range for Intel Hex file"),
+                        abfd, buf);
                      bfd_set_error (bfd_error_bad_value);
                      return FALSE;
                    }
@@ -918,6 +926,7 @@ ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define ihex_make_empty_symbol                    _bfd_generic_make_empty_symbol
 #define ihex_print_symbol                         _bfd_nosymbols_print_symbol
 #define ihex_get_symbol_info                      _bfd_nosymbols_get_symbol_info
+#define ihex_get_symbol_version_string           _bfd_nosymbols_get_symbol_version_string
 #define ihex_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
 #define ihex_bfd_is_local_label_name              _bfd_nosymbols_bfd_is_local_label_name
 #define ihex_get_lineno                           _bfd_nosymbols_get_lineno
@@ -939,10 +948,10 @@ ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define ihex_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
 #define ihex_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
 #define ihex_bfd_link_just_syms                   _bfd_generic_link_just_syms
-#define ihex_bfd_copy_link_hash_symbol_type \
-  _bfd_generic_copy_link_hash_symbol_type
+#define ihex_bfd_copy_link_hash_symbol_type       _bfd_generic_copy_link_hash_symbol_type
 #define ihex_bfd_final_link                       _bfd_generic_final_link
 #define ihex_bfd_link_split_section               _bfd_generic_link_split_section
+#define ihex_bfd_link_check_relocs                _bfd_generic_link_check_relocs
 
 /* The Intel Hex target vector.  */