* elf64-ppc.c (adjust_opd_syms): Fix merge error.

[external/binutils.git] / bfd / demo64.c

diff --git a/bfd/demo64.c b/bfd/demo64.c
index c91381d..a8c0b32 100644 (file)
--- a/bfd/demo64.c
+++ b/bfd/demo64.c
@@ -1,5 +1,6 @@
 /* BFD backend for demonstration 64-bit a.out binaries.
 /* BFD backend for demonstration 64-bit a.out binaries.

-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 2001
+   Free Software Foundation, Inc.

    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -19,6 +20,11 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define ARCH_SIZE 64
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define ARCH_SIZE 64

-#define MY(OP) CAT(demo_64_,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 (demo_64_,OP)
+

 #define TARGETNAME  "demo64"
 #include "aoutf1.h"
 #define TARGETNAME  "demo64"
 #include "aoutf1.h"