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

diff --git a/bfd/gen-aout.c b/bfd/gen-aout.c
index b5ed91a096..ea207db6e9 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, 2002
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -20,6 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "/usr/include/a.out.h"
 #include <stdio.h>
 
+#ifndef _
+#define _(X) X
+#endif
+
 int
 main (argc, argv)
      int argc; char** argv;
@@ -86,9 +91,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");