From 9b624dbeed0c879156474b1da5d9fb52bd179d8b Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sat, 17 Nov 2007 00:44:38 +0000 Subject: * config/arm/embed.mt (SIM_OBS, SIM): Remove. * config/avr/avr.mt (SIM_OBS, SIM): Remove. * config/frv/frv.mt (SIM_OBS, SIM): Remove. * config/h8300/h8300.mt (SIM_OBS, SIM): Remove. * config/iq2000/iq2000.mt (SIM_OBS, SIM): Remove. * config/m32c/m32c.mt (SIM_OBS, SIM): Remove. * config/m32r/linux.mt (SIM_OBS, SIM): Remove. * config/m32r/m32r.mt (SIM_OBS, SIM): Remove. * config/m68hc11/m68hc11.mt (SIM_OBS, SIM): Remove. * config/mips/embed.mt (SIM_OBS, SIM): Remove. * config/mips/linux.mt (SIM_OBS, SIM): Remove. * config/mips/nbsd.mt (SIM_OBS, SIM): Remove. * config/mn10300/mn10300.mt (SIM_OBS, SIM): Remove. * config/powerpc/linux.mt (SIM_OBS, SIM): Remove. * config/powerpc/nbsd.mt (SIM_OBS, SIM): Remove. * config/powerpc/ppc-sim.mt: Remove file. * config/sh/embed.mt (SIM_OBS, SIM): Remove. * config/sh/linux.mt (SIM_OBS, SIM): Remove. * config/sh/nbsd.mt (SIM_OBS, SIM): Remove. * config/sh/sh64.mt (SIM_OBS, SIM): Remove. * config/sparc/embed.mt (SIM_OBS, SIM): Remove. * config/v850/v850.mt (SIM_OBS, SIM): Remove. * config/xstormy16/xstormy16.mt (SIM_OBS, SIM): Remove. * configure.tgt (gdb_sim): Document variable. (arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*): Set it. (avr-*-*): Likewise. (frv-*-*): Likewise. (h8300-*-*): Likewise. (iq2000-*-*): Likewise. (m32c-*-*): Likewise. (m32r*-*-linux*): Likewise. (m32r*-*-*): Likewise. (m68hc11*-*-*|m6811*-*-*): Likewise. (mips*-*-*): Likewise. (mips*-*-linux*): Likewise. (mips*-*-netbsd* | mips*-*-knetbsd*-gnu): Likewise. (mn10300-*-*): Likewise. (powerpc-*-linux* | powerpc64-*-linux*): Likewise. (powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu): Likewise. (powerpc*-*-*): Use ppc-eabi target. Conditionally set gdb_sim. (sh*): Set gdb_sim. (sh-*-linux*): Likewise. (sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu): Likewise. (sh64-*-elf*): Likewise. (sparc-*-rtems*): Likewise. (v850*-*-elf): Likewise. (xstormy16-*-*): Likewise. * configure.ac (IGNORE_SIM, IGNORE_SIM_OBS): Do not set. (SIM, SIM_OBS): Set depending on ${ignore_sim} and ${gdb_sim}. * configure: Regenerate. * Makefile.in (SIM, SIM_OBS): Substitute from configure. (@IGNORE_SIM@, @IGNORE_SIM_OBS@): Remove. --- gdb/configure.ac | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gdb/configure.ac') diff --git a/gdb/configure.ac b/gdb/configure.ac index e07a42a..c451781 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1490,7 +1490,7 @@ if test x"$enable_tui" = xyes; then fi # Unlike the sim directory, whether a simulator is linked is controlled by -# presence of a SIM= and a SIM_OBS= definition in the target '.mt' file. +# presence of a gdb_sim definition in the target configure.tgt entry. # This code just checks for a few cases where we'd like to ignore those # definitions, even when they're present in the '.mt' file. These cases # are when --disable-sim is specified, or if the simulator directory is @@ -1511,16 +1511,17 @@ if test ! -d "${srcdir}/../sim"; then ignore_sim=true fi -if test "${ignore_sim}" = "true"; then - IGNORE_SIM="SIM=" - IGNORE_SIM_OBS="SIM_OBS=" -else - IGNORE_SIM="" - IGNORE_SIM_OBS="" +SIM= +SIM_OBS= +if test "${ignore_sim}" = "false"; then + if test x"${gdb_sim}" != x ; then + SIM="${gdb_sim}" + SIM_OBS="remote-sim.o" AC_DEFINE(WITH_SIM, 1, [Define if the simulator is being linked in.]) + fi fi -AC_SUBST(IGNORE_SIM) -AC_SUBST(IGNORE_SIM_OBS) +AC_SUBST(SIM) +AC_SUBST(SIM_OBS) AC_SUBST(ENABLE_CFLAGS) AC_SUBST(PROFILE_CFLAGS) -- cgit v1.1