daily update

[binutils.git] / bfd / m88kmach3.c

diff --git a/bfd/m88kmach3.c b/bfd/m88kmach3.c
index a076764e261202a992cb8fbff9bc8fbc9bef5457..79e3bb8312b37de5ee79b0c0f3c67d9db688e17a 100644 (file)
--- a/bfd/m88kmach3.c
+++ b/bfd/m88kmach3.c
@@ -1,5 +1,6 @@
 /* BFD back-end for Motorola m88k a.out (Mach 3) binaries.
-   Copyright (C) 1990, 1991, 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1993, 1994, 1995, 2001, 2003
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -15,17 +16,13 @@ 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.  */
 
-#ifndef MACH
-#define MACH
-#endif
-
-#define        PAGE_SIZE       (4096*2)
+#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
 
 #define N_TXTSIZE(x)   ((x).a_text)
 
@@ -35,7 +32,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "libaout.h"
 
 #define DEFAULT_ARCH bfd_arch_m88k
-#define MY(OP) CAT(m88kmach3_,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 (m88kmach3_,OP)
 #define TARGETNAME "a.out-m88k-mach3"
 
 #include "aout-target.h"