correct ft32 reloc range test
[deliverable/binutils-gdb.git] / bfd / aout-adobe.c
index 7e781d4d74ba867074ca377b21ea60e6e02b5fc9..48189d8aab41a114b331974b9e6cd2a5ce5dd64c 100644 (file)
@@ -1,5 +1,5 @@
 /* BFD back-end for a.out.adobe binaries.
-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2018 Free Software Foundation, Inc.
    Written by Cygnus Support.  Based on bout.c.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -86,8 +86,8 @@ aout_adobe_callback (bfd *abfd)
   bfd_set_arch_mach (abfd, bfd_arch_unknown, 0L);
 
   /* The positions of the string table and symbol table.  */
-  obj_str_filepos (abfd) = N_STROFF (*execp);
-  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
+  obj_str_filepos (abfd) = N_STROFF (execp);
+  obj_sym_filepos (abfd) = N_SYMOFF (execp);
 
   /* Suck up the section information from the file, one section at a time.  */
   for (;;)
@@ -121,8 +121,9 @@ aout_adobe_callback (bfd *abfd)
          goto no_more_sections;
 
        default:
-         (*_bfd_error_handler)
-           (_("%B: Unknown section type in a.out.adobe file: %x\n"),
+         _bfd_error_handler
+           /* xgettext:c-format */
+           (_("%pB: unknown section type in a.out.adobe file: %x"),
             abfd, ext->e_type[0]);
          goto no_more_sections;
        }
@@ -166,12 +167,12 @@ aout_adobe_callback (bfd *abfd)
        switch (ext->e_type[0])
          {
          case N_TEXT:
-           sect->rel_filepos = N_TRELOFF (*execp);
+           sect->rel_filepos = N_TRELOFF (execp);
            sect->reloc_count = execp->a_trsize;
            break;
 
          case N_DATA:
-           sect->rel_filepos = N_DRELOFF (*execp);
+           sect->rel_filepos = N_DRELOFF (execp);
            sect->reloc_count = execp->a_drsize;
            break;
 
@@ -213,7 +214,7 @@ aout_adobe_object_p (bfd *abfd)
      If the environment variable GNUTARGET is set to "a.out.adobe", we will
      take just about any a.out file as an Adobe a.out file.  FIXME!  */
 
-  if (N_BADMAG (anexec))
+  if (N_BADMAG (&anexec))
     {
       targ = getenv ("GNUTARGET");
       if (targ && !strcmp (targ, aout_adobe_vec.name))
@@ -333,14 +334,14 @@ aout_adobe_write_object_contents (bfd *abfd)
   /* Now write out reloc info, followed by syms and strings.  */
   if (bfd_get_symcount (abfd) != 0)
     {
-      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET)
+      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (exec_hdr (abfd))), SEEK_SET)
          != 0)
        return FALSE;
 
       if (! aout_32_write_syms (abfd))
        return FALSE;
 
-      if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*exec_hdr (abfd))), SEEK_SET)
+      if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (exec_hdr (abfd))), SEEK_SET)
          != 0)
        return FALSE;
 
@@ -349,7 +350,7 @@ aout_adobe_write_object_contents (bfd *abfd)
          if (!aout_32_squirt_out_relocs (abfd, sect))
            return FALSE;
 
-      if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*exec_hdr (abfd))), SEEK_SET)
+      if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (exec_hdr (abfd))), SEEK_SET)
          != 0)
        return FALSE;
 
@@ -377,7 +378,7 @@ aout_adobe_set_section_contents (bfd *abfd,
     {
       /* Assign file offsets to sections.  Text sections are first, and
         are contiguous.  Then data sections.  Everything else at the end.  */
-      section_start = N_TXTOFF (ignore<-->me);
+      section_start = N_TXTOFF (0);
 
       for (sect = abfd->sections; sect; sect = sect->next)
        {
@@ -451,27 +452,30 @@ aout_adobe_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED,
 #define aout_32_bfd_make_debug_symbol              _bfd_nosymbols_bfd_make_debug_symbol
 #define aout_32_bfd_reloc_type_lookup              _bfd_norelocs_bfd_reloc_type_lookup
 #define aout_32_bfd_reloc_name_lookup              _bfd_norelocs_bfd_reloc_name_lookup
-#define aout_32_close_and_cleanup                   aout_32_bfd_free_cached_info
-#define        aout_32_set_arch_mach                       aout_adobe_set_arch_mach
-#define        aout_32_set_section_contents                aout_adobe_set_section_contents
-#define        aout_32_sizeof_headers                      aout_adobe_sizeof_headers
+#define aout_32_close_and_cleanup                  aout_32_bfd_free_cached_info
+#define        aout_32_set_arch_mach                       aout_adobe_set_arch_mach
+#define        aout_32_set_section_contents                aout_adobe_set_section_contents
+#define        aout_32_sizeof_headers                      aout_adobe_sizeof_headers
 #define aout_32_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
-#define aout_32_get_section_contents_in_window      _bfd_generic_get_section_contents_in_window
-#define aout_32_bfd_relax_section                   bfd_generic_relax_section
-#define aout_32_bfd_gc_sections                     bfd_generic_gc_sections
+#define aout_32_get_section_contents_in_window     _bfd_generic_get_section_contents_in_window
+#define aout_32_bfd_relax_section                  bfd_generic_relax_section
+#define aout_32_bfd_gc_sections                            bfd_generic_gc_sections
 #define aout_32_bfd_lookup_section_flags           bfd_generic_lookup_section_flags
-#define aout_32_bfd_merge_sections                 bfd_generic_merge_sections
-#define aout_32_bfd_is_group_section               bfd_generic_is_group_section
-#define aout_32_bfd_discard_group                  bfd_generic_discard_group
-#define aout_32_section_already_linked              _bfd_generic_section_already_linked
-#define aout_32_bfd_define_common_symbol            bfd_generic_define_common_symbol
-#define aout_32_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
-#define aout_32_bfd_link_add_symbols               _bfd_generic_link_add_symbols
-#define aout_32_bfd_link_just_syms                 _bfd_generic_link_just_syms
+#define aout_32_bfd_merge_sections                 bfd_generic_merge_sections
+#define aout_32_bfd_is_group_section               bfd_generic_is_group_section
+#define aout_32_bfd_discard_group                  bfd_generic_discard_group
+#define aout_32_section_already_linked             _bfd_generic_section_already_linked
+#define aout_32_bfd_define_common_symbol           bfd_generic_define_common_symbol
+#define aout_32_bfd_define_start_stop              bfd_generic_define_start_stop
+#define aout_32_bfd_link_hash_table_create         _bfd_generic_link_hash_table_create
+#define aout_32_bfd_link_add_symbols               _bfd_generic_link_add_symbols
+#define aout_32_bfd_link_just_syms                 _bfd_generic_link_just_syms
 #define aout_32_bfd_copy_link_hash_symbol_type \
   _bfd_generic_copy_link_hash_symbol_type
-#define aout_32_bfd_final_link                     _bfd_generic_final_link
-#define aout_32_bfd_link_split_section             _bfd_generic_link_split_section
+#define aout_32_bfd_final_link                     _bfd_generic_final_link
+#define aout_32_bfd_link_split_section             _bfd_generic_link_split_section
+#define aout_32_bfd_link_check_relocs              _bfd_generic_link_check_relocs
+#define aout_32_set_reloc                          _bfd_generic_set_reloc
 
 const bfd_target aout_adobe_vec =
 {
@@ -496,12 +500,24 @@ const bfd_target aout_adobe_vec =
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
   bfd_getb16, bfd_getb_signed_16, bfd_putb16,  /* Headers.  */
 
-  {_bfd_dummy_target, aout_adobe_object_p,     /* bfd_check_format.  */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, aout_adobe_mkobject,             /* bfd_set_format.  */
-   _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, aout_adobe_write_object_contents,/* bfd_write_contents.  */
-   _bfd_write_archive_contents, bfd_false},
+  {                            /* bfd_check_format.  */
+    _bfd_dummy_target,
+    aout_adobe_object_p,
+    bfd_generic_archive_p,
+    _bfd_dummy_target
+  },
+  {                            /* bfd_set_format.  */
+    _bfd_bool_bfd_false_error,
+    aout_adobe_mkobject,
+    _bfd_generic_mkarchive,
+    _bfd_bool_bfd_false_error
+  },
+  {                            /* bfd_write_contents.  */
+    _bfd_bool_bfd_false_error,
+    aout_adobe_write_object_contents,
+    _bfd_write_archive_contents,
+    _bfd_bool_bfd_false_error
+  },
 
   BFD_JUMP_TABLE_GENERIC (aout_32),
   BFD_JUMP_TABLE_COPY (_bfd_generic),
This page took 0.02536 seconds and 4 git commands to generate.