From 5a2402b8e0a796b75b1d394fb73360f14e83cc33 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 2 Aug 2000 11:11:47 +0000 Subject: Thu Jul 27 17:38:35 2000 Andrew Cagney * configure.in (targetfile): Ignore TM_FILE, don't just issue warning. (tm_h, xm_h, nm_h, GDB_TM_FILE, GDB_XM_FILE, GDB_NM_FILE): Define. * acconfig.h (GDB_XM_FILE, GDB_TM_FILE, GDB_NM_FILE): Add. * config/nm-empty.h: Delete. * defs.h (xm.h, nm.h, tm.h): Only include when GDB_XM_FILE, GDB_NM_FILE or GDB_TM_FILE defined. * Makefile.in (defs_h): Replace tm.h, xm.h and nm.h with tm_h, xm_h and nm_h macro that are defined by configure. (tm_h, xm_h, tm_h): New. * configure, config.in: Regenerate * TODO: Update. --- gdb/defs.h | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'gdb/defs.h') diff --git a/gdb/defs.h b/gdb/defs.h index 6e4a222..1ff7d66 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -79,7 +79,7 @@ #define GDB_MULTI_ARCH_TM 2 /* The target is pure multi-arch. The MULTI-ARCH vector provides all - definitions. "tm.h" is NOT included. */ + definitions. "tm.h" is linked to an empty file. */ #define GDB_MULTI_ARCH_PURE 3 @@ -710,29 +710,35 @@ enum val_prettyprint }; -/* Host machine definition. This will be a symlink to one of the - xm-*.h files, built by the `configure' script. */ +/* Optional host machine definition. Pure autoconf targets will not + need a "xm.h" file. This will be a symlink to one of the xm-*.h + files, built by the `configure' script. */ +#ifdef GDB_XM_FILE #include "xm.h" +#endif -/* Native machine support. This will be a symlink to one of the - nm-*.h files, built by the `configure' script. */ +/* Optional native machine support. Non-native (and possibly pure + multi-arch) targets do not need a "nm.h" file. This will be a + symlink to one of the nm-*.h files, built by the `configure' + script. */ +#ifdef GDB_NM_FILE #include "nm.h" +#endif -/* Target machine definition. This will be a symlink to one of the +/* Optional target machine definition. Pure multi-arch configurations + do not need a "tm.h" file. This will be a symlink to one of the tm-*.h files, built by the `configure' script. */ -#if (GDB_MULTI_ARCH < GDB_MULTI_ARCH_PURE) +#ifdef GDB_TM_FILE #include "tm.h" #endif /* GDB_MULTI_ARCH is normally set by configure.in using information from configure.tgt or the config/%/%.mt Makefile fragment. Since - some targets have defined it in their tm.h file, don't provide a - default until after "tm.h" has been included. (In the above #if, - GDB_MULTI_ARCH will be interpreted as zero if it is not - defined). */ + some targets have defined it in their "tm.h" file, delay providing + a default definition until after "tm.h" has been included.. */ #ifndef GDB_MULTI_ARCH #define GDB_MULTI_ARCH 0 -- cgit v1.1