X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fm68knetbsd.c;h=2f8b6ad522b11b391428a21620f00babc170a48d;hb=0bf60745767d2465c81ee57ae7705a62d6d8fafe;hp=24d166565399924f84d1afee6b8c9c461ff7c47e;hpb=252b5132c753830d5fd56823373aed85f2a0db63;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/m68knetbsd.c b/bfd/m68knetbsd.c
index 24d1665653..2f8b6ad522 100644
--- a/bfd/m68knetbsd.c
+++ b/bfd/m68knetbsd.c
@@ -1,5 +1,6 @@
 /* BFD back-end for NetBSD/m68k a.out-ish binaries.
-   Copyright (C) 1990, 91, 92, 94, 95, 97, 1998 Free Software Foundation, Inc.
+   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.
 
@@ -15,19 +16,22 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, 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
-   assume 8K page alignment so they will work on all m68k machines. */
+   assume 8K page alignment so they will work on all m68k machines.  */
 #define TARGET_PAGE_SIZE	0x2000
 
 #define DEFAULT_ARCH	bfd_arch_m68k
 #define DEFAULT_MID 	M_68K_NETBSD
 
-#define MY(OP) CAT(m68knetbsd_,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 (m68knetbsd_,OP)
+
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-m68k-netbsd"