[PATCH] bfd: tweak SET_ARCH_MACH of aout-cris.c

[deliverable/binutils-gdb.git] / bfd / libaout.h

diff --git a/bfd/libaout.h b/bfd/libaout.h
index c7d787dc7d28f69e5510b52529bc9b71cd303a0c..61746db243a4b7f4d8de4879e07838fdf76b62b3 100644 (file)
--- a/bfd/libaout.h
+++ b/bfd/libaout.h
@@ -1,5 +1,5 @@
 /* BFD back-end data structures for a.out (and similar) files.
 /* BFD back-end data structures for a.out (and similar) files.

-   Copyright (C) 1990-2018 Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -309,7 +309,7 @@ enum machine_type
 # define N_SET_INFO(execp, magic, type, flags) \
 ((execp)->a_info = ((magic) & 0xffff) \
  | (((int)(type) & 0xff) << 16) \
 # define N_SET_INFO(execp, magic, type, flags) \
 ((execp)->a_info = ((magic) & 0xffff) \
  | (((int)(type) & 0xff) << 16) \

- | (((flags) & 0xff) << 24))
+ | (((flags) & 0xffu) << 24))

 #endif
 
 #ifndef N_SET_DYNAMIC
 #endif
 
 #ifndef N_SET_DYNAMIC


@@ -332,7 +332,7 @@ enum machine_type
 #ifndef N_SET_FLAGS
 # define N_SET_FLAGS(execp, flags) \
 ((execp)->a_info = \
 #ifndef N_SET_FLAGS
 # define N_SET_FLAGS(execp, flags) \
 ((execp)->a_info = \

- ((execp)->a_info & 0x00ffffff) | (((flags) & 0xff) << 24))
+ ((execp)->a_info & 0x00ffffff) | (((flags) & 0xffu) << 24))

 #endif
 
 typedef struct aout_symbol
 #endif
 
 typedef struct aout_symbol


@@ -349,7 +349,7 @@ typedef struct aout_symbol
 
 enum aout_subformat {
   default_format = 0,
 
 enum aout_subformat {
   default_format = 0,

-  /* Used on HP 9000/300 running HP/UX.  See hp300hpux.c.  */
+  /* Used on HP 9000/300 running HP/UX.  */

   gnu_encap_format,
   /* Used on Linux, 386BSD, etc.  See include/aout/aout64.h.  */
   q_magic_format
   gnu_encap_format,
   /* Used on Linux, 386BSD, etc.  See include/aout/aout64.h.  */
   q_magic_format


@@ -359,7 +359,8 @@ enum aout_magic {
   undecided_magic = 0,
   z_magic,
   o_magic,
   undecided_magic = 0,
   z_magic,
   o_magic,

-  n_magic
+  n_magic,
+  i_magic

 };
 
 struct aoutdata
 };
 
 struct aoutdata


@@ -475,8 +476,8 @@ extern bfd_boolean NAME (aout, squirt_out_relocs)
 extern bfd_boolean NAME (aout, make_sections)
   (bfd *);
 
 extern bfd_boolean NAME (aout, make_sections)
   (bfd *);
 

-extern const bfd_target * NAME (aout, some_aout_object_p)
-  (bfd *, struct internal_exec *, const bfd_target *(*) (bfd *));
+extern bfd_cleanup NAME (aout, some_aout_object_p)
+  (bfd *, struct internal_exec *, bfd_cleanup (*) (bfd *));

 
 extern bfd_boolean NAME (aout, mkobject)
   (bfd *);
 
 extern bfd_boolean NAME (aout, mkobject)
   (bfd *);