daily update

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

diff --git a/bfd/i386mach3.c b/bfd/i386mach3.c
index af08827f6708f18f5713ce202e2adf89506116d7..15137c7e9ed9d60915e1abc7127d57c9eb709c33 100644 (file)
--- a/bfd/i386mach3.c
+++ b/bfd/i386mach3.c
@@ -1,5 +1,6 @@
 /* BFD back-end for i386 a.out binaries.
-   Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2001, 2002, 2003
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -15,7 +16,7 @@ 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.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* This is for Mach 3, which uses a.out, not Mach-O.  */
 
@@ -23,11 +24,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    from i386aout or i386bsd.  So this target is only useful if it is the
    default target.  */
 
-#define        PAGE_SIZE       1
-#define        SEGMENT_SIZE    0
+#define        TARGET_PAGE_SIZE        1
+#define        SEGMENT_SIZE    0x1000
 #define TEXT_START_ADDR        0x10000
 #define ARCH 32
-#define BYTES_IN_WORD 4
 /* This macro is only relevant when N_MAGIC(x) == ZMAGIC.  */
 #define N_HEADER_IN_TEXT(x)    1
 
@@ -42,17 +42,29 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "libaout.h"           /* BFD a.out internal data structures */
 
 #define DEFAULT_ARCH bfd_arch_i386
-#define MY(OP) CAT(i386mach3_,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 (i386mach3_,OP)
 #define TARGETNAME "a.out-mach3"
 
-static boolean MY(set_sizes)();
+static bfd_boolean MY (set_sizes) PARAMS ((bfd *));
 #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 */
+  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 */
 };
 
 #include "aout-target.h"