(cr16c_elf_final_link_relocate): Remove duplicated return statements and

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

diff --git a/bfd/ihex.c b/bfd/ihex.c
index a7636a9027e07660e878eb403c026d661b8f7c2f..c692b03b33abff2f4acd20d1def073a30d34d0b1 100644 (file)
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -261,8 +261,8 @@ ihex_bad_byte (abfd, lineno, c, error)
          buf[1] = '\0';
        }
       (*_bfd_error_handler)
-       (_("%s:%d: unexpected character `%s' in Intel Hex file\n"),
-        bfd_archive_filename (abfd), lineno, buf);
+       (_("%B:%d: unexpected character `%s' in Intel Hex file"),
+        abfd, lineno, buf);
       bfd_set_error (bfd_error_bad_value);
     }
 }
@@ -369,8 +369,8 @@ ihex_scan (abfd)
          if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
            {
              (*_bfd_error_handler)
-               (_("%s:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
-                bfd_archive_filename (abfd), lineno,
+               (_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
+                abfd, lineno,
                 (- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
              bfd_set_error (bfd_error_bad_value);
              goto error_return;
@@ -423,8 +423,8 @@ ihex_scan (abfd)
              if (len != 2)
                {
                  (*_bfd_error_handler)
-                   (_("%s:%u: bad extended address record length in Intel Hex file"),
-                    bfd_archive_filename (abfd), lineno);
+                   (_("%B:%u: bad extended address record length in Intel Hex file"),
+                    abfd, lineno);
                  bfd_set_error (bfd_error_bad_value);
                  goto error_return;
                }
@@ -440,8 +440,8 @@ ihex_scan (abfd)
              if (len != 4)
                {
                  (*_bfd_error_handler)
-                   (_("%s:%u: bad extended start address length in Intel Hex file"),
-                    bfd_archive_filename (abfd), lineno);
+                   (_("%B:%u: bad extended start address length in Intel Hex file"),
+                    abfd, lineno);
                  bfd_set_error (bfd_error_bad_value);
                  goto error_return;
                }
@@ -457,8 +457,8 @@ ihex_scan (abfd)
              if (len != 2)
                {
                  (*_bfd_error_handler)
-                   (_("%s:%u: bad extended linear address record length in Intel Hex file"),
-                    bfd_archive_filename (abfd), lineno);
+                   (_("%B:%u: bad extended linear address record length in Intel Hex file"),
+                    abfd, lineno);
                  bfd_set_error (bfd_error_bad_value);
                  goto error_return;
                }
@@ -474,8 +474,8 @@ ihex_scan (abfd)
              if (len != 2 && len != 4)
                {
                  (*_bfd_error_handler)
-                   (_("%s:%u: bad extended linear start address length in Intel Hex file"),
-                    bfd_archive_filename (abfd), lineno);
+                   (_("%B:%u: bad extended linear start address length in Intel Hex file"),
+                    abfd, lineno);
                  bfd_set_error (bfd_error_bad_value);
                  goto error_return;
                }
@@ -491,8 +491,8 @@ ihex_scan (abfd)
 
            default:
              (*_bfd_error_handler)
-               (_("%s:%u: unrecognized ihex type %u in Intel Hex file\n"),
-                bfd_archive_filename (abfd), lineno, type);
+               (_("%B:%u: unrecognized ihex type %u in Intel Hex file"),
+                abfd, lineno, type);
              bfd_set_error (bfd_error_bad_value);
              goto error_return;
            }
@@ -616,8 +616,7 @@ ihex_read_section (abfd, section, contents)
       if (type != 0)
        {
          (*_bfd_error_handler)
-           (_("%s: internal error in ihex_read_section"),
-            bfd_archive_filename (abfd));
+           (_("%B: internal error in ihex_read_section"), abfd);
          bfd_set_error (bfd_error_bad_value);
          goto error_return;
        }
@@ -651,8 +650,7 @@ ihex_read_section (abfd, section, contents)
   if ((bfd_size_type) (p - contents) < section->size)
     {
       (*_bfd_error_handler)
-       (_("%s: bad section length in ihex_read_section"),
-        bfd_archive_filename (abfd));
+       (_("%B: bad section length in ihex_read_section"), abfd);
       bfd_set_error (bfd_error_bad_value);
       goto error_return;
     }
@@ -970,6 +968,7 @@ ihex_sizeof_headers (abfd, exec)
 #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_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
 #define ihex_find_nearest_line _bfd_nosymbols_find_nearest_line