correct ft32 reloc range test

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

diff --git a/bfd/ieee.c b/bfd/ieee.c
index 174ab19c197c2e31566488364975dfc48d40f776..7285ee5b552f8559d6b706263a8537d8b63ac63f 100644 (file)
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -156,7 +156,7 @@ ieee_write_id (bfd *abfd, const char *id)
     {
       _bfd_error_handler
        /* xgettext:c-format */
-       (_("%B: string too long (%ld chars, max 65535)"), abfd, (long) length);
+       (_("%pB: string too long (%ld chars, max 65535)"), abfd, (long) length);
       bfd_set_error (bfd_error_invalid_operation);
       return FALSE;
     }
@@ -299,7 +299,7 @@ ieee_write_expression (bfd *abfd,
            {
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B: unrecognized symbol `%s' flags 0x%x"),
+               (_("%pB: unrecognized symbol `%s' flags 0x%x"),
                 abfd, bfd_asymbol_name (symbol), symbol->flags);
              bfd_set_error (bfd_error_invalid_operation);
              return FALSE;
@@ -834,7 +834,7 @@ ieee_slurp_external_symbols (bfd *abfd)
                  default:
                    _bfd_error_handler
                      /* xgettext:c-format */
-                     (_("%B: unimplemented ATI record %u for symbol %u"),
+                     (_("%pB: unimplemented ATI record %u for symbol %u"),
                       abfd, symbol_attribute_def, symbol_name_index);
                    bfd_set_error (bfd_error_bad_value);
                    return FALSE;
@@ -859,8 +859,8 @@ ieee_slurp_external_symbols (bfd *abfd)
                  {
                    _bfd_error_handler
                      /* xgettext:c-format */
-                     (_("%B: unexpected ATN type %Ld in external part"),
-                        abfd, value);
+                     (_("%pB: unexpected ATN type %" PRId64 " in external part"),
+                        abfd, (int64_t) value);
                    bfd_set_error (bfd_error_bad_value);
                    return FALSE;
                  }
@@ -881,7 +881,7 @@ ieee_slurp_external_symbols (bfd *abfd)
 
                      default:
                        _bfd_error_handler
-                         (_("%B: unexpected type after ATN"), abfd);
+                         (_("%pB: unexpected type after ATN"), abfd);
                        bfd_set_error (bfd_error_bad_value);
                        return FALSE;
                      }
@@ -3853,26 +3853,20 @@ ieee_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
 #define        ieee_close_and_cleanup _bfd_generic_close_and_cleanup
 #define ieee_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
 
-#define ieee_slurp_armap bfd_true
-#define ieee_slurp_extended_name_table bfd_true
+#define ieee_slurp_armap _bfd_bool_bfd_true
+#define ieee_slurp_extended_name_table _bfd_bool_bfd_true
 #define ieee_construct_extended_name_table \
-  ((bfd_boolean (*) \
-    (bfd *, char **, bfd_size_type *, const char **)) \
-   bfd_true)
+  _bfd_noarchive_construct_extended_name_table
 #define ieee_truncate_arname bfd_dont_truncate_arname
-#define ieee_write_armap \
-  ((bfd_boolean (*) \
-    (bfd *, unsigned int, struct orl *, unsigned int, int)) \
-   bfd_true)
-#define ieee_read_ar_hdr bfd_nullvoidptr
-#define ieee_write_ar_hdr ((bfd_boolean (*) (bfd *, bfd *)) bfd_false)
-#define ieee_update_armap_timestamp bfd_true
+#define ieee_write_armap _bfd_noarchive_write_armap
+#define ieee_read_ar_hdr _bfd_ptr_bfd_null_error
+#define ieee_write_ar_hdr _bfd_noarchive_write_ar_hdr
+#define ieee_update_armap_timestamp _bfd_bool_bfd_true
 #define ieee_get_elt_at_index _bfd_generic_get_elt_at_index
 
 #define ieee_get_symbol_version_string \
   _bfd_nosymbols_get_symbol_version_string
-#define ieee_bfd_is_target_special_symbol  \
-  ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define ieee_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false
 #define ieee_bfd_is_local_label_name bfd_generic_is_local_label_name
 #define ieee_get_lineno _bfd_nosymbols_get_lineno
 #define ieee_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
@@ -3936,16 +3930,16 @@ const bfd_target ieee_vec =
    _bfd_dummy_target,
   },
   {
-    bfd_false,
+    _bfd_bool_bfd_false_error,
     ieee_mkobject,
     _bfd_generic_mkarchive,
-    bfd_false
+    _bfd_bool_bfd_false_error
   },
   {
-    bfd_false,
+    _bfd_bool_bfd_false_error,
     ieee_write_object_contents,
     _bfd_write_archive_contents,
-    bfd_false,
+    _bfd_bool_bfd_false_error,
   },
 
   /* ieee_close_and_cleanup, ieee_bfd_free_cached_info, ieee_new_section_hook,