From 3a42b741a59e282e8b756168682f792f3af33af1 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 2 Oct 2001 05:58:41 +0000 Subject: * version.h: New file. * bfd-in.h: (BFD_VERSION): Substitute bfd_version. (BFD_VERSION_DATE): Define. (BFD_VERSION_STRING): Define. * configure.in: AC_SUBST bfd_version, bfd_version_date and bfd_version_string. (AC_OUTPUT ): Depend on version.h. * bfd-in2.h: Regenerate. * configure: Regenerate. * Makefile.am: Run "make dep-am" * Makefile.in: Regenerate. * bfd-in.h: Include "symcat.h". (CONCAT4): Redefine as for old CAT4. * aout-arm.c: Use equivalent CONCAT* macro in place of CAT* macros. Add warning regarding whitespace. * aout-cris.c: Likewise. * aout-ns32k.c: Likewise. * aout-sparcle.c: Likewise. * aout-tic30.c: Likewise. * aout0.c: Likewise. * armnetbsd.c: Likewise. * demo64.c: Likewise. * elf-bfd.h: Likewise. * gen-aout.c: Likewise. * host-aout.c: Likewise. * hp300bsd.c: Likewise. * hp300hpux.c: Likewise. * i386aout.c: Likewise. * i386bsd.c: Likewise. * i386dynix.c: Likewise. * i386freebsd.c: Likewise. * i386linux.c: Likewise. * i386lynx.c: Likewise. * i386mach3.c: Likewise. * i386netbsd.c: Likewise. * libaout.h: Likewise. * m68k4knetbsd.c: Likewise. * m68klinux.c: Likewise. * m68klynx.c: Likewise. * m68knetbsd.c: Likewise. * m88kmach3.c: Likewise. * mipsbsd.c: Likewise. * newsos3.c: Likewise. * ns32knetbsd.c: Likewise. * pc532-mach.c: Likewise. * pdp11.c: Likewise. * riscix.c: Likewise. * sparclinux.c: Likewise. * sparclynx.c: Likewise. * sparcnetbsd.c: Likewise. * sunos.c: Likewise. * targets.c: Likewise. * vaxnetbsd.c: Likewise. * vms-hdr.c: Likewise. --- bfd/libaout.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'bfd/libaout.h') diff --git a/bfd/libaout.h b/bfd/libaout.h index c6eb5c2a90..d7e5c7166f 100644 --- a/bfd/libaout.h +++ b/bfd/libaout.h @@ -78,6 +78,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Parameterize the a.out code based on whether it is being built for a 32-bit architecture or a 64-bit architecture. */ +/* Do not "beautify" the CONCAT* macro args. Traditional C will not + remove whitespace added here, and thus will fail to concatenate + the tokens. */ #if ARCH_SIZE==64 #define GET_WORD H_GET_64 #define GET_SWORD H_GET_S64 @@ -85,9 +88,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PUT_WORD H_PUT_64 #define PUT_MAGIC H_PUT_32 #ifndef NAME -#define NAME(x,y) CAT3(x,_64_,y) +#define NAME(x,y) CONCAT3 (x,_64_,y) #endif -#define JNAME(x) CAT(x,_64) +#define JNAME(x) CONCAT2 (x,_64) #define BYTES_IN_WORD 8 #else #if ARCH_SIZE==16 @@ -97,9 +100,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PUT_WORD H_PUT_16 #define PUT_MAGIC H_PUT_16 #ifndef NAME -#define NAME(x,y) CAT3(x,_16_,y) +#define NAME(x,y) CONCAT3 (x,_16_,y) #endif -#define JNAME(x) CAT(x,_16) +#define JNAME(x) CONCAT2 (x,_16) #define BYTES_IN_WORD 2 #else /* ARCH_SIZE == 32 */ #define GET_WORD H_GET_32 @@ -108,9 +111,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define PUT_WORD H_PUT_32 #define PUT_MAGIC H_PUT_32 #ifndef NAME -#define NAME(x,y) CAT3(x,_32_,y) +#define NAME(x,y) CONCAT3 (x,_32_,y) #endif -#define JNAME(x) CAT(x,_32) +#define JNAME(x) CONCAT2 (x,_32) #define BYTES_IN_WORD 4 #endif /* ARCH_SIZE==32 */ #endif /* ARCH_SIZE==64 */ -- cgit v1.2.1