X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fi386dynix.c;h=30d24505380aaa8f9f23fe6da1a9e10a4b70f1e2;hb=fd885f3a4d85dc33d794ca359ea91f31e3082717;hp=a27c51720768327d7a35fbf3f9faa75d339a0e11;hpb=bdf1b51158889dfdd8b0334c62768eac200f6ab0;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/i386dynix.c b/bfd/i386dynix.c
index a27c517207..30d2450538 100644
--- a/bfd/i386dynix.c
+++ b/bfd/i386dynix.c
@@ -1,54 +1,61 @@
 /* BFD back-end for i386 a.out binaries under dynix.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 2001, 2003, 2005, 2007 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 3 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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* This BFD is currently only tested with gdb, writing object files
    may not work.  */
 
-#define BYTES_IN_WORD	4
-#define ARCH	32
-
 #define TEXT_START_ADDR 4096
-#define PAGE_SIZE	4096
-#define SEGMENT_SIZE	PAGE_SIZE
+#define TARGET_PAGE_SIZE	4096
+#define SEGMENT_SIZE	TARGET_PAGE_SIZE
 
 #include "aout/dynix3.h"
 
 #define DEFAULT_ARCH	bfd_arch_i386
 #define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
 
-#define MY(OP) CAT(i386dynix_,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 (i386dynix_,OP)
 #define TARGETNAME "a.out-i386-dynix"
+#define NAME(x,y) CONCAT3 (i386dynix,_32_,y)
+#define ARCH_SIZE 32
+#define NAME_swap_exec_header_in NAME(i386dynix_32_,swap_exec_header_in)
+#define MY_get_section_contents aout_32_get_section_contents
+
+/* aoutx.h requires definitions for NMAGIC, BMAGIC and QMAGIC.  */
+#define NMAGIC 0
+#define BMAGIC OMAGIC
+#define QMAGIC XMAGIC
 
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"
+#include "aoutx.h"
 
 /* (Ab)use some fields in the internal exec header to be able to read
    executables that contain shared data.  */
 
 #define a_shdata a_tload
 #define a_shdrsize a_dload
-#define aout_32_swap_exec_header_in dynix_swap_exec_header_in
 
 void
-dynix_swap_exec_header_in (abfd, raw_bytes, execp)
+i386dynix_32_swap_exec_header_in (abfd, raw_bytes, execp)
      bfd *abfd;
      struct external_exec *raw_bytes;
      struct internal_exec *execp;
@@ -61,7 +68,7 @@ dynix_swap_exec_header_in (abfd, raw_bytes, execp)
      are memcmp'd, and thus the contents do matter. */
   memset ((PTR) execp, 0, sizeof (struct internal_exec));
   /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info   = bfd_h_get_32 (abfd, bytes->e_info);
+  execp->a_info   = H_GET_32 (abfd, bytes->e_info);
   execp->a_text   = GET_WORD (abfd, bytes->e_text);
   execp->a_data   = GET_WORD (abfd, bytes->e_data);
   execp->a_bss    = GET_WORD (abfd, bytes->e_bss);