Revert PR16467 change

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

diff --git a/bfd/i386aout.c b/bfd/i386aout.c
index 128e9d20dc04a52943bf91275ca0e0dc414e4604..68328106ef7c4b57c0bf2ce96a52974a598c2fa6 100644 (file)
--- a/bfd/i386aout.c
+++ b/bfd/i386aout.c
@@ -1,12 +1,11 @@
 /* BFD back-end for i386 a.out binaries.
 /* BFD back-end for i386 a.out binaries.

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

 
    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
 
    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
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,7 +15,9 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+

 
 /* The only 386 aout system we have here is GO32 from DJ.
    These numbers make BFD work with that. If your aout 386 system
 
 /* The only 386 aout system we have here is GO32 from DJ.
    These numbers make BFD work with that. If your aout 386 system


@@ -27,7 +28,7 @@
 #define N_HEADER_IN_TEXT(x)    0
 #define N_TXTOFF(x)            0x20
 #define N_TXTADDR(x)           (N_MAGIC (x) == ZMAGIC ? 0x1020 : 0)
 #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 N_TXTSIZE(x)           ((x)->a_text)

 #define TARGET_PAGE_SIZE       4096
 #define SEGMENT_SIZE           0x400000
 #define DEFAULT_ARCH           bfd_arch_i386
 #define TARGET_PAGE_SIZE       4096
 #define SEGMENT_SIZE           0x400000
 #define DEFAULT_ARCH           bfd_arch_i386


@@ -35,12 +36,12 @@
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
 /* 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 MY(OP) CONCAT2 (i386_aout_,OP)

 #define TARGETNAME "a.out-i386"
 #define NO_WRITE_HEADER_KLUDGE 1
 
 #define TARGETNAME "a.out-i386"
 #define NO_WRITE_HEADER_KLUDGE 1
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 #include "aout/aout64.h"
 #include "libaout.h"
 #include "libbfd.h"
 #include "aout/aout64.h"
 #include "libaout.h"


@@ -53,7 +54,7 @@ i386aout_write_object_contents (bfd *abfd)
   struct external_exec exec_bytes;
   struct internal_exec *execp = exec_hdr (abfd);
 
   struct external_exec exec_bytes;
   struct internal_exec *execp = exec_hdr (abfd);
 

-  N_SET_MACHTYPE (*execp, M_386);
+  N_SET_MACHTYPE (execp, M_386);

 
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
 
 
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;