Convert to ISO C90 formatting

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

diff --git a/bfd/i386dynix.c b/bfd/i386dynix.c
index a27c51720768327d7a35fbf3f9faa75d339a0e11..17871962c1f4345ec18fe2382fb0af2df8d87662 100644 (file)
--- a/bfd/i386dynix.c
+++ b/bfd/i386dynix.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries under dynix.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -15,40 +15,45 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 +66,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);