* Makefile.in (alphanbsd-tdep.o): Add $(frame_h) to dependency

[deliverable/binutils-gdb.git] / bfd / i386mach3.c

diff --git a/bfd/i386mach3.c b/bfd/i386mach3.c
index f0bddcebcef2754b2b0c6c515e39fc99824cad53..4364eb84bd0e6b0d1b8df6f290e198cc44b5f7d6 100644 (file)
--- a/bfd/i386mach3.c
+++ b/bfd/i386mach3.c
@@ -43,12 +43,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libaout.h"           /* BFD a.out internal data structures */
 
 #define DEFAULT_ARCH bfd_arch_i386
-#define MY(OP) CAT(i386mach3_,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 (i386mach3_,OP)
 #define TARGETNAME "a.out-mach3"
 
 static boolean MY (set_sizes) PARAMS ((bfd *));
 #define MY_backend_data &MY(backend_data)
-static CONST struct aout_backend_data MY(backend_data) = {
+static const struct aout_backend_data MY(backend_data) = {
   0,                           /* zmagic contiguous */
   1,                           /* text incl header */
   0,                           /* entry is text address */