Jakub Jelinek <jj@ultra.linux.cz>

[deliverable/binutils-gdb.git] / bfd / aout-adobe.c

diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c
index ee8b780dd6224b8ca2aecb6095b54f68176ccb67..2c11ffe9ff20298b7dad0ce5de65b6ba1bf6c967 100644 (file)
--- a/bfd/aout-adobe.c
+++ b/bfd/aout-adobe.c
@@ -112,8 +112,6 @@ aout_adobe_object_p (abfd)
      take just about any a.out file as an Adobe a.out file.  FIXME!  */
 
   if (N_BADMAG (anexec)) {
-    extern char *getenv ();
-
     targ = getenv ("GNUTARGET");
     if (targ && !strcmp (targ, a_out_adobe_vec.name))
       ;                /* Just continue anyway, if specifically set to this format */
@@ -180,8 +178,9 @@ aout_adobe_callback (abfd)
       goto no_more_sections;
 
     default:
-      fprintf (stderr, "Unknown section type in a.out.adobe file: %x\n", 
-              ext->e_type[0]);
+      (*_bfd_error_handler)
+       (_("%s: Unknown section type in a.out.adobe file: %x\n"), 
+        bfd_get_filename (abfd), ext->e_type[0]);
       goto no_more_sections;
     }
 
@@ -201,10 +200,8 @@ aout_adobe_callback (abfd)
     /* Fix the name, if it is a sprintf'd name.  */
     if (sect->name == try_again) {
       newname = (char *) bfd_zalloc(abfd, strlen (sect->name));
-      if (newname == NULL) {
-       bfd_set_error (bfd_error_no_memory);
+      if (newname == NULL)
        return 0;
-      }
       strcpy (newname, sect->name);
       sect->name = newname;
     }
@@ -255,10 +252,8 @@ aout_adobe_mkobject (abfd)
   struct bout_data_struct *rawptr;
 
   rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct));
-  if (rawptr == NULL) {
-      bfd_set_error (bfd_error_no_memory);
+  if (rawptr == NULL)
       return false;
-    }
 
   abfd->tdata.bout_data = rawptr;
   exec_hdr (abfd) = &rawptr->e;
@@ -481,7 +476,9 @@ aout_adobe_sizeof_headers (ignore_abfd, ignore)
 #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_bfd_link_hash_table_create \
   _bfd_generic_link_hash_table_create
 #define aout_32_bfd_link_add_symbols   _bfd_generic_link_add_symbols
@@ -492,8 +489,8 @@ const bfd_target a_out_adobe_vec =
 {
   "a.out.adobe",               /* name */
   bfd_target_aout_flavour,
-  true,                                /* data byte order is unknown (big assumed) */
-  true,                                /* hdr byte order is big */
+  BFD_ENDIAN_BIG,              /* data byte order is unknown (big assumed) */
+  BFD_ENDIAN_BIG,              /* hdr byte order is big */
   (HAS_RELOC | EXEC_P |                /* object flags */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT ),
@@ -502,7 +499,6 @@ const bfd_target a_out_adobe_vec =
   '_',                         /*  symbol leading char */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */
-  2,                           /* minumum alignment power */
 
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
      bfd_getb32, bfd_getb_signed_32, bfd_putb32,