Update to ISO-C90 and fix formatting

[binutils.git] / bfd / i386aout.c

diff --git a/bfd/i386aout.c b/bfd/i386aout.c
index da63cc64f104f1965fd45b6daeee4626338e5a22..bea384e8ec19e118929ce692bef70a74b7557510 100644 (file)
--- a/bfd/i386aout.c
+++ b/bfd/i386aout.c
@@ -1,64 +1,87 @@
 /* BFD back-end for i386 a.out binaries.
 /* BFD back-end for i386 a.out binaries.

-   Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1994, 1996, 1997, 2001, 2002, 2003, 2005
+   Free Software Foundation, Inc.

 
 

-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.

 
 

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   You should have received a copy of the GNU General Public License
+   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 ([email protected]) the runes to make it work on your
    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 ([email protected]) the runes to make it work on your

-   system, and I'll stick it in for the next release.
-
- */
-#define TARGET_IS_LITTLE_ENDIAN_P
-#define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
-#define ARCH 32
-
-#define N_TXTOFF(x) 0x20
-#define N_TXTADDR(x) (N_MAGIC(x)==ZMAGIC ? 0x1020 : 0)
-
-#define N_TXTSIZE(x) ((x).a_text)
-#if 0
-#define N_DATADDR(x) (N_MAGIC(x)==OMAGIC? (N_TXTADDR(x)+(x).a_text) : (SEGMENT_SIZE + ((0x1020+(x).a_text-1) & ~(SEGMENT_SIZE-1))))
-#define NOSUBEXECB
+   system, and I'll stick it in for the next release.  */

 
 

-#endif
-#define PAGE_SIZE 4096
-#define SEGMENT_SIZE 0x400000
-#define DEFAULT_ARCH bfd_arch_i386
+#define N_HEADER_IN_TEXT(x)    0
+#define N_TXTOFF(x)            0x20
+#define N_TXTADDR(x)           (N_MAGIC (x) == ZMAGIC ? 0x1020 : 0)
+#define N_TXTSIZE(x)           ((x).a_text)
+#define TARGET_PAGE_SIZE       4096
+#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
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"
 #define TARGETNAME "a.out-i386"
 #define NO_WRITE_HEADER_KLUDGE 1
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libbfd.h"

+#include "aout/aout64.h"

 #include "libaout.h"
 #include "libaout.h"

-static boolean MY(set_sizes)();
-#define MY_backend_data &MY(backend_data)
-static CONST struct aout_backend_data MY(backend_data) = {
-  0,                           /* zmagic contiguous */
-  1,                           /* text incl header */
-  0,                           /* text vma? */
-  MY(set_sizes),
-  1,                           /* exec header not counted */
-};
+
+/* Set the machine type correctly.  */
+
+static bfd_boolean
+i386aout_write_object_contents (bfd *abfd)
+{
+  struct external_exec exec_bytes;
+  struct internal_exec *execp = exec_hdr (abfd);
+
+  N_SET_MACHTYPE (*execp, M_386);
+
+  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+
+  WRITE_HEADERS (abfd, execp);
+
+  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);

 
 #include "aout-target.h"
 
 #include "aout-target.h"

+
+static const struct aout_backend_data MY (backend_data) =
+{
+  0,                           /* Zmagic contiguous.  */
+  1,                           /* Text incl header.  */
+  0,                           /* Entry is text address.  */
+  0,                           /* Exec_hdr_flags.  */
+  0,                           /* Text vma?  */
+  MY (set_sizes),
+  1,                           /* Exec header not counted.  */
+  0,                           /* Add_dynamic_symbols.  */
+  0,                           /* Add_one_symbol.  */
+  0,                           /* Link_dynamic_object.  */
+  0,                           /* Write_dynamic_symbol.  */
+  0,                           /* Check_dynamic_reloc.  */
+  0                            /* Finish_dynamic_link.  */
+};