Changeset 609 for branches/GNU/src/binutils/bfd/pc532-mach.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/pc532-mach.c (modified) (5 diffs, 1 prop)

branches/GNU/src/binutils/bfd/pc532-mach.c

@@ -1 +1 @@
 /* BFD back-end for Mach3/532 a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1994, 1995, 2000, 2001
+   Copyright 1990, 1991, 1992, 1994, 1995, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
@@ -51 +51 @@
 #define DEFAULT_ARCH bfd_arch_ns32k
 
-#define MY(OP) CAT(pc532machaout_,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 (pc532machaout_,OP)
 
 /* Must be the same as aout-ns32k.c */
-#define NAME(x,y) CAT3(ns32kaout,_32_,y)
+#define NAME(x,y) CONCAT3 (ns32kaout,_32_,y)
 
 #define TARGETNAME "a.out-pc532-mach"
@@ -63 +66 @@
 #include "libbfd.h"
 #include "aout/aout64.h"
-
-/* We can`t use the MYNS macro here for cpp reasons too subtle for me -- IWD */
 
 #define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
@@ -76 +77 @@
 #define MY_exec_header_not_counted 1
 
-#define MYNSX(OP) CAT(ns32kaout_,OP)
-reloc_howto_type *
-MYNSX(bfd_reloc_type_lookup)
-  PARAMS((bfd *abfd AND
-          bfd_reloc_code_real_type code));
+reloc_howto_type *ns32kaout_bfd_reloc_type_lookup
+  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 
-boolean
-MYNSX(write_object_contents)
-  PARAMS((bfd *abfd));
+static bfd_boolean MY(write_object_contents)
+  PARAMS ((bfd *abfd));
 
-static boolean
+static bfd_boolean
 MY(write_object_contents) (abfd)
-bfd *abfd;
+     bfd *abfd;
 {
   struct external_exec exec_bytes;
@@ -110 +107 @@
   WRITE_HEADERS(abfd, execp);
 
-  return true;
+  return TRUE;
 }