(BYTES_IN_WORD): Don't define.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f5ac6762d0fdbd2c2eaa0c0bf6b56a96cead77e9..21f874a5e49efd0576fb5e25fdff2d5b6d3a4fdf 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,27 @@
+2003-03-13  Elias Athanasopoulos  <elathan@phys.uoa.gr>
+
+       * aout-cris.c (BYTES_IN_WORD): Don't define.
+       aout-encap.c: Likewise.
+       aout-ns32k.c: Likewise.
+       aout-tic30.c: Likewise.
+       hp300bsd.c: Likewise.
+       i386aout.c: Likewise.
+       i386dynix.c: Likewise.
+       i386linux.c: Likewise.
+       i386lynx.c: Likewise.
+       i386mach3.c: Likewise.
+       m68k4knetbsd.c: Likewise.
+       m68klinux.c: Likewise.
+       m68klynx.c: Likewise.
+       m68knetbsd.c: Likewise.
+       m88kmach3.c: Likewise.
+       mipsbsd.c: Likewise.
+       newsos3.c: Likewise.
+       sparclinux.c: Likewise.
+       sparclynx.c: Likewise.
+       sparcnetbsd.c: Likewise.
+       vaxbsd.c: Likewise. Fix comment formatting.
+
 2003-03-12  Alexandre Oliva  <aoliva@redhat.com>
 
        * Reverted 2003-03-02's patch.

diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index 7027b173ca0597da560ac0ce17c4f3061b2c9ca9..4d1e48d7bf42c80c0aaa0620e6513abe668dc395 100644 (file)
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -1,5 +1,5 @@
 /* BFD backend for CRIS a.out binaries.
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
 
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    functions.  Beware; some of the information there is outdated.  */
 
 #define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
 #define N_TXTOFF(x) 32
 #define ENTRY_CAN_BE_ZERO
 #define TEXT_START_ADDR 0

diff --git a/bfd/aout-encap.c b/bfd/aout-encap.c
index 1a794ec978b2779038b48deec7866cae2098ea2c..96c7082933325b2e4a4c8831b69cd9015e9deb7e 100644 (file)
--- a/bfd/aout-encap.c
+++ b/bfd/aout-encap.c
@@ -1,5 +1,5 @@
 /* BFD back-end for a.out files encapsulated with COFF headers.
-   Copyright 1990, 1991, 1994, 1995, 2000, 2001, 2002
+   Copyright 1990, 1991, 1994, 1995, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        TARGET_PAGE_SIZE        4096
 #define        SEGMENT_SIZE    TARGET_PAGE_SIZE
 #define TEXT_START_ADDR 0
-#define BYTES_IN_WORD 4
 #endif
 
 #include "bfd.h"

diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c
index 4809ffb89b3c8abdd29c4bd168ae43a824daee9f..0972b5db187b294aa2841a81f800644aa7682bc6 100644 (file)
--- a/bfd/aout-ns32k.c
+++ b/bfd/aout-ns32k.c
@@ -1,5 +1,5 @@
 /* BFD back-end for ns32k a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002
+   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
    Contributed by Ian Dall (idall@eleceng.adelaide.edu.au).
 
@@ -19,8 +19,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define BYTES_IN_WORD 4
-
 #include "bfd.h"
 #include "aout/aout64.h"
 #include "ns32k.h"

diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c
index 6d5f48ca42d88947415aef50231fe97f06ca65a4..6e65fcf40aec11c959d55ed3e63c6fd0b97d755d 100644 (file)
--- a/bfd/aout-tic30.c
+++ b/bfd/aout-tic30.c
@@ -1,5 +1,5 @@
 /* BFD back-end for TMS320C30 a.out binaries.
-   Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -21,7 +21,6 @@
 
 #define TARGET_IS_BIG_ENDIAN_P
 #define N_HEADER_IN_TEXT(x) 1
-#define BYTES_IN_WORD 4
 #define TEXT_START_ADDR 1024
 #define TARGET_PAGE_SIZE 128
 #define SEGMENT_SIZE TARGET_PAGE_SIZE

diff --git a/bfd/hp300bsd.c b/bfd/hp300bsd.c
index c0e3f958df8d04fe477a9492b06a0abf047e0517..4d005ce9acafb89db61e17155b55e06af7c61db0 100644 (file)
--- a/bfd/hp300bsd.c
+++ b/bfd/hp300bsd.c
@@ -1,5 +1,5 @@
 /* BFD back-end for HP 9000/300 (68000-based) machines running BSD Unix.
-   Copyright 1992, 1994, 1995, 2001 Free Software Foundation, Inc.
+   Copyright 1992, 1994, 1995, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define TARGET_IS_BIG_ENDIAN_P
 #define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
 #define ENTRY_CAN_BE_ZERO
 #define N_SHARED_LIB(x) 0 /* Avoids warning */
 #define TEXT_START_ADDR 0

diff --git a/bfd/i386aout.c b/bfd/i386aout.c
index b2d106f623115dda8b1d8508b1cdf9d3c353ce0b..6b2948ef4cc807f36eb84ed0f21b2800f914e26a 100644 (file)
--- a/bfd/i386aout.c
+++ b/bfd/i386aout.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries.
-   Copyright 1990, 1991, 1992, 1994, 1996, 1997, 2001, 2002
+   Copyright 1990, 1991, 1992, 1994, 1996, 1997, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    system, and I'll stick it in for the next release.  */
 
 #define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
 
 #define N_TXTOFF(x) 0x20
 #define N_TXTADDR(x) (N_MAGIC(x)==ZMAGIC ? 0x1020 : 0)

diff --git a/bfd/i386dynix.c b/bfd/i386dynix.c
index 51f0844d196dc9910e5cff653c79b8ae251deca6..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 1994, 1995, 2001 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -20,8 +20,6 @@ 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 TEXT_START_ADDR 4096
 #define TARGET_PAGE_SIZE       4096
 #define SEGMENT_SIZE   TARGET_PAGE_SIZE

diff --git a/bfd/i386linux.c b/bfd/i386linux.c
index 5a2d382b9408f097576e947a9c71ce4dadf8c4c9..6403e1c608bf3407c25973066a52fd6074c9a1dd 100644 (file)
--- a/bfd/i386linux.c
+++ b/bfd/i386linux.c
@@ -1,5 +1,5 @@
 /* BFD back-end for linux flavored i386 a.out binaries.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR        0x0
 #define N_SHARED_LIB(x) 0
-#define BYTES_IN_WORD 4
 
 #define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
 

diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c
index 6bf6e727b21f6bd1ea7c1f1c80a0aacf9e1f5206..32274ea6c7f7831332f4e17bd95fd9b20e11a42a 100644 (file)
--- a/bfd/i386lynx.c
+++ b/bfd/i386lynx.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries under LynxOS.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2001, 2002
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -18,7 +18,6 @@ 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.  */
 
-#define BYTES_IN_WORD 4
 #define N_SHARED_LIB(x) 0
 
 #define TEXT_START_ADDR 0

diff --git a/bfd/i386mach3.c b/bfd/i386mach3.c
index 0e4c4e752e3bedfc204f87c2237dbc3662140f96..215f814a1ca0142c229154953e742c77dbad12c4 100644 (file)
--- a/bfd/i386mach3.c
+++ b/bfd/i386mach3.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries.
-   Copyright 1990, 1991, 1993, 1994, 1995, 1997, 2001, 2002
+   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.
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #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
 

diff --git a/bfd/m68k4knetbsd.c b/bfd/m68k4knetbsd.c
index 13e0a6d398110ebf5680b8f419c75af2422388f1..1ca4a626999e6970f6a9a5d3899356a564b68eec 100644 (file)
--- a/bfd/m68k4knetbsd.c
+++ b/bfd/m68k4knetbsd.c
@@ -1,5 +1,5 @@
 /* BFD back-end for NetBSD/m68k a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1995, 1998, 2001
+   Copyright 1990, 1991, 1992, 1995, 1998, 2001, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -18,7 +18,6 @@ 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.  */
 
-#define BYTES_IN_WORD  4
 #define TARGET_IS_BIG_ENDIAN_P
 
 #define TARGET_PAGE_SIZE       0x1000

diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c
index a526998c51ad98a6aac15d43019455c5e19a41a2..1a829806975c56a2f7bc59cf58477e3edb3646ea 100644 (file)
--- a/bfd/m68klinux.c
+++ b/bfd/m68klinux.c
@@ -1,5 +1,5 @@
 /* BFD back-end for linux flavored m68k a.out binaries.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR        0x0
 #define N_SHARED_LIB(x) 0
-#define BYTES_IN_WORD 4
 
 #define MACHTYPE_OK(mtype) ((mtype) == M_68020 || (mtype) == M_UNKNOWN)
 

diff --git a/bfd/m68klynx.c b/bfd/m68klynx.c
index 00571ca71f624f499fe076e24e9d9136838a09c1..46fa0763dae9298bfaea0dd0afff155630431c81 100644 (file)
--- a/bfd/m68klynx.c
+++ b/bfd/m68klynx.c
@@ -1,5 +1,5 @@
 /* BFD back-end for m68k binaries under LynxOS.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2002
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -18,7 +18,6 @@ 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.  */
 
-#define BYTES_IN_WORD 4
 #define N_SHARED_LIB(x) 0
 
 #define TEXT_START_ADDR 0

diff --git a/bfd/m68knetbsd.c b/bfd/m68knetbsd.c
index 521d6468f9d9c47b3898aeb283956d944acf049e..2a748891b99a35f8e09fc60d425ce36c0517beee 100644 (file)
--- a/bfd/m68knetbsd.c
+++ b/bfd/m68knetbsd.c
@@ -1,5 +1,5 @@
 /* BFD back-end for NetBSD/m68k a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1994, 1995, 1997, 1998, 2000, 2001
+   Copyright 1990, 1991, 1992, 1994, 1995, 1997, 1998, 2000, 2001, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -18,7 +18,6 @@ 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.  */
 
-#define BYTES_IN_WORD  4
 #define TARGET_IS_BIG_ENDIAN_P
 
 /* Our m68k ports use either 4K or 8K pages, but object files always

diff --git a/bfd/m88kmach3.c b/bfd/m88kmach3.c
index 8305401463dc8bcba15ff0202b5a1b3733c631de..79e3bb8312b37de5ee79b0c0f3c67d9db688e17a 100644 (file)
--- a/bfd/m88kmach3.c
+++ b/bfd/m88kmach3.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Motorola m88k a.out (Mach 3) binaries.
-   Copyright 1990, 1991, 1993, 1994, 1995, 2001
+   Copyright 1990, 1991, 1993, 1994, 1995, 2001, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        TARGET_PAGE_SIZE        (4096*2)
 #define SEGMENT_SIZE   0x20000
 #define TEXT_START_ADDR        0
-#define BYTES_IN_WORD  4
 #define N_HEADER_IN_TEXT(x)    1               /* (N_MAGIG(x) == ZMAGIC) */
 #define N_SHARED_LIB(x) 0
 

diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c
index 581ace299ecd49006849f20f6a062a1e374ed36c..af1ba55aeca8bfca35b21f571b14d73eebcd407d 100644 (file)
--- a/bfd/mipsbsd.c
+++ b/bfd/mipsbsd.c
@@ -1,5 +1,5 @@
 /* BFD backend for MIPS BSD (a.out) binaries.
-   Copyright 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002
+   Copyright 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
    Written by Ralph Campbell.
 
@@ -19,7 +19,6 @@ 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.  */
 
-#define BYTES_IN_WORD 4
 /* #define ENTRY_CAN_BE_ZERO */
 #define N_HEADER_IN_TEXT(x) 1
 #define N_SHARED_LIB(x) 0

diff --git a/bfd/newsos3.c b/bfd/newsos3.c
index 34c4216e6d683ad7d662dc319dfcf9128ba8c7dd..d0a5c54817ed23281b6e93392e4d48aa8e00a4b3 100644 (file)
--- a/bfd/newsos3.c
+++ b/bfd/newsos3.c
@@ -1,5 +1,5 @@
 /* BFD back-end for NewsOS3 (Sony, 68k) binaries.
-   Copyright 1990, 1991, 1994, 1995, 2000, 2001
+   Copyright 1990, 1991, 1994, 1995, 2000, 2001, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define        TARGET_PAGE_SIZE        4096
 #define        SEGMENT_SIZE    TARGET_PAGE_SIZE
 #define TEXT_START_ADDR 0
-#define BYTES_IN_WORD 4
 
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate

diff --git a/bfd/sparclinux.c b/bfd/sparclinux.c
index 4352727a20637edb5045bf9efe61e15cd9859f06..40e49c85e3eb1ca2e5ad69aff54104accaa1b3ef 100644 (file)
--- a/bfd/sparclinux.c
+++ b/bfd/sparclinux.c
@@ -1,5 +1,5 @@
 /* BFD back-end for linux flavored sparc a.out binaries.
-   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002
+   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -24,7 +24,6 @@ USA.  */
 #define SEGMENT_SIZE           TARGET_PAGE_SIZE
 #define TEXT_START_ADDR                0x0
 #define N_SHARED_LIB(x)                0
-#define BYTES_IN_WORD          4
 
 #define MACHTYPE_OK(mtype) ((mtype) == M_SPARC || (mtype) == M_UNKNOWN)
 

diff --git a/bfd/sparclynx.c b/bfd/sparclynx.c
index 84d9d4a9d0aa1b499eca1b2ee431b654598cf8db..6be9a4446b1df67d9edea00bb89bb23a9b695984 100644 (file)
--- a/bfd/sparclynx.c
+++ b/bfd/sparclynx.c
@@ -1,6 +1,6 @@
 /* BFD support for Sparc binaries under LynxOS.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000,
-   2001, 2002 Free Software Foundation, Inc.
+   2001, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -19,7 +19,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #if 0
-#define BYTES_IN_WORD 4
 #define N_SHARED_LIB(x) 0
 
 #define TEXT_START_ADDR 0

diff --git a/bfd/sparcnetbsd.c b/bfd/sparcnetbsd.c
index 64d0eb10e84a48dbc07c83a39cd0af90533faa4a..be8e53634905eb8b40149b69018acf620ad41338 100644 (file)
--- a/bfd/sparcnetbsd.c
+++ b/bfd/sparcnetbsd.c
@@ -1,5 +1,5 @@
 /* BFD back-end for NetBSD/sparc a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1994, 1995, 1997, 1998, 2000, 2001
+   Copyright 1990, 1991, 1992, 1994, 1995, 1997, 1998, 2000, 2001, 2003
    Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -18,7 +18,6 @@ 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.  */
 
-#define BYTES_IN_WORD  4
 #define TARGET_IS_BIG_ENDIAN_P
 
 /* SPARC chips use either 4K or 8K pages, but object files always

diff --git a/bfd/vaxbsd.c b/bfd/vaxbsd.c
index 5faedbee4c2c422d2fc8a50867d6344e33091d58..a97408fa0685d40ecda674f13dc92cf3b8428d31 100644 (file)
--- a/bfd/vaxbsd.c
+++ b/bfd/vaxbsd.c
@@ -1,5 +1,5 @@
 /* BFD back-end for BSD and Ultrix/VAX (1K page size) a.out-ish binaries.
-   Copyright 2002 Free Software Foundation, Inc.
+   Copyright 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -18,7 +18,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
 #define ENTRY_CAN_BE_ZERO
 #define N_SHARED_LIB(x) 0 /* Avoids warning */
 #define TEXT_START_ADDR 0
@@ -26,7 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define DEFAULT_ARCH bfd_arch_vax
 
-/* 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 (vaxbsd_,OP)
 
 #define TARGETNAME "a.out-vax-bsd"