X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fgen-aout.c;h=1bba14adb5bc3578843892adaa164aaabaf00390;hb=86fb1dece37497b267579ed4f062d280cd5760cd;hp=b5ed91a096b4ea3db66326a00f2089c3d15ee3a6;hpb=27e232885db363fb545fd2f450e72d929e59b8f6;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/gen-aout.c b/bfd/gen-aout.c
index b5ed91a096..1bba14adb5 100644
--- a/bfd/gen-aout.c
+++ b/bfd/gen-aout.c
@@ -1,5 +1,6 @@
 /* Generate parameters for an a.out system.
-   Copyright (C) 1990, 91, 92, 93, 94, 98 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 2001
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -86,9 +87,12 @@ main (argc, argv)
       fprintf (stderr, _("         fix DEFAULT_ARCH in the output file yourself\n"));
       arch = "unknown";
     }
-  printf("#define DEFAULT_ARCH bfd_arch_%s\n", arch);
+  printf("#define DEFAULT_ARCH bfd_arch_%s\n\n", arch);
 
-  printf("\n#define MY(OP) CAT(%s_,OP)\n", target);
+  printf("/* Do not \"beautify\" the CONCAT* macro args.  Traditional C will not");
+  printf("   remove whitespace added here, and thus will fail to concatenate");
+  printf("   the tokens.  */");
+  printf("\n#define MY(OP) CONCAT2 (%s_,OP)\n\n", target);
   printf("#define TARGETNAME \"a.out-%s\"\n\n", target);
 
   printf("#include \"bfd.h\"\n");