2003-09-09 Jeff Johnston <jjohnstn@redhat.com>

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

diff --git a/bfd/i386aout.c b/bfd/i386aout.c
index 63ba13a907ebdc4242153d90e59dc797569f9803..6b2948ef4cc807f36eb84ed0f21b2800f914e26a 100644 (file)
--- a/bfd/i386aout.c
+++ b/bfd/i386aout.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries.
-   Copyright 1990, 1991, 1992, 1994, 1996, 1997, 2001
+   Copyright 1990, 1991, 1992, 1994, 1996, 1997, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -19,14 +19,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
-/* The only 386 aout system we have here is GO32 from DJ. 
+/* The only 386 aout system we have here is GO32 from DJ.
    These numbers make BFD work with that. If your aout 386 system
    doesn't work with these, we'll have to split them into different
    files.  Send me (sac@cygnus.com) the runes to make it work on your
    system, and I'll stick it in for the next release.  */
 
 #define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
 
 #define N_TXTOFF(x) 0x20
 #define N_TXTADDR(x) (N_MAGIC(x)==ZMAGIC ? 0x1020 : 0)
@@ -41,7 +40,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define SEGMENT_SIZE 0x400000
 #define DEFAULT_ARCH bfd_arch_i386
 
-#define MY(OP) CAT(i386aout_,OP)
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386aout_,OP)
 #define TARGETNAME "a.out-i386"
 #define NO_WRITE_HEADER_KLUDGE 1
 
@@ -51,12 +53,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "aout/aout64.h"
 #include "libaout.h"
 
-static boolean i386aout_write_object_contents PARAMS ((bfd *));
-static boolean MY (set_sizes) PARAMS ((bfd *));
+static bfd_boolean i386aout_write_object_contents PARAMS ((bfd *));
+static bfd_boolean MY (set_sizes) PARAMS ((bfd *));
 
 /* Set the machine type correctly.  */
 
-static boolean
+static bfd_boolean
 i386aout_write_object_contents (abfd)
      bfd *abfd;
 {
@@ -69,13 +71,13 @@ i386aout_write_object_contents (abfd)
 
   WRITE_HEADERS (abfd, execp);
 
-  return true;
+  return TRUE;
 }
 
 #define MY_write_object_contents i386aout_write_object_contents
 
 #define MY_backend_data &MY(backend_data)
-static CONST struct aout_backend_data MY(backend_data) = {
+static const struct aout_backend_data MY(backend_data) = {
   0,                           /* zmagic contiguous */
   1,                           /* text incl header */
   0,                           /* entry is text address */