27 files changed, 110 insertions, 100 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4264c23..b86f6d1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,62 @@
 2007-11-16  Ulrich Weigand  <uweigand@de.ibm.com>
 
+	* 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.
+
+2007-11-16  Ulrich Weigand  <uweigand@de.ibm.com>
+
 	* configure.tgt (gdb_osabi, build_gdbserver): Comment variables.
 	(arm*-*-*): Do not set obsolete build_rdi_share variable.
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5f24aff..4909983 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -262,7 +262,7 @@ OPCODES_CFLAGS = -I$(OP_INCLUDE)
 
 # The simulator is usually nonexistent; targets that include one
 # should set this to list all the .o or .a files to be linked in.
-SIM =
+SIM = @SIM@
 
 WIN32LIBS = @WIN32LIBS@
 
@@ -427,20 +427,13 @@ SER_HARDWIRE = @SER_HARDWIRE@
 REMOTE_OBS = remote.o dcache.o tracepoint.o ax-general.o ax-gdb.o remote-fileio.o
 
 # This is remote-sim.o if a simulator is to be linked in.
-SIM_OBS =
+SIM_OBS = @SIM_OBS@
 
 # Host and target-dependent makefile fragments come in here.
 @host_makefile_frag@
 @target_makefile_frag@
 # End of host and target-dependent makefile fragments
 
-# Possibly ignore the simulator.  If the simulator is being ignored,
-# these expand into SIM= and SIM_OBJ=, overriding the entries from
-# target_makefile_frag
-#
-@IGNORE_SIM@
-@IGNORE_SIM_OBS@
-
 FLAGS_TO_PASS = \
 	"prefix=$(prefix)" \
 	"exec_prefix=$(exec_prefix)" \
diff --git a/gdb/config/arm/embed.mt b/gdb/config/arm/embed.mt
index 4fe0147..19b1236 100644
--- a/gdb/config/arm/embed.mt
+++ b/gdb/config/arm/embed.mt
@@ -1,5 +1,2 @@
 # Target: ARM embedded system
 TDEPFILES= arm-tdep.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/arm/libsim.a
diff --git a/gdb/config/avr/avr.mt b/gdb/config/avr/avr.mt
index 0354a42..4587d3e 100644
--- a/gdb/config/avr/avr.mt
+++ b/gdb/config/avr/avr.mt
@@ -1,12 +1,2 @@
 # Target: AVR
 TDEPFILES= avr-tdep.o
-
-#
-# There is no simulator provided with gdb (yet).
-#
-# See <http://savannah.gnu.org/projects/simulavr/> for the simulator
-# used during development of avr support for gdb.
-#
-# Simulator: AVR
-#SIM_OBS = remote-sim.o
-#SIM = ../sim/avr/libsim.a
diff --git a/gdb/config/frv/frv.mt b/gdb/config/frv/frv.mt
index 8f15051..da3c00b 100644
--- a/gdb/config/frv/frv.mt
+++ b/gdb/config/frv/frv.mt
@@ -1,4 +1,2 @@
 # Target: Fujitsu FRV processor
 TDEPFILES= frv-tdep.o frv-linux-tdep.o solib.o solib-frv.o corelow.o
-SIM_OBS = remote-sim.o
-SIM = ../sim/frv/libsim.a
diff --git a/gdb/config/h8300/h8300.mt b/gdb/config/h8300/h8300.mt
index 9e579be..d23ee8e 100644
--- a/gdb/config/h8300/h8300.mt
+++ b/gdb/config/h8300/h8300.mt
@@ -1,5 +1,2 @@
 # Target: H8300 with HMS monitor and H8 simulator
 TDEPFILES= h8300-tdep.o monitor.o dsrec.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/h8300/libsim.a
diff --git a/gdb/config/iq2000/iq2000.mt b/gdb/config/iq2000/iq2000.mt
index 8d5dfb8..347acc7 100644
--- a/gdb/config/iq2000/iq2000.mt
+++ b/gdb/config/iq2000/iq2000.mt
@@ -1,3 +1 @@
 TDEPFILES= iq2000-tdep.o
-SIM_OBS= remote-sim.o
-SIM= ../sim/iq2000/libsim.a
diff --git a/gdb/config/m32c/m32c.mt b/gdb/config/m32c/m32c.mt
index 2a404d4..a282bfb 100644
--- a/gdb/config/m32c/m32c.mt
+++ b/gdb/config/m32c/m32c.mt
@@ -1,7 +1,2 @@
 # Target: Renesas M32C family
 TDEPFILES = m32c-tdep.o prologue-value.o
-
-# There may also be a SID / CGEN simulator for this, but we do have DJ
-# Delorie's mini-sim.
-SIM_OBS = remote-sim.o
-SIM = ../sim/m32c/libsim.a
diff --git a/gdb/config/m32r/linux.mt b/gdb/config/m32r/linux.mt
index e27fc67..fccbaa1 100644
--- a/gdb/config/m32r/linux.mt
+++ b/gdb/config/m32r/linux.mt
@@ -1,5 +1,2 @@
 # Target: Renesas M32R running GNU/Linux
 TDEPFILES= m32r-tdep.o m32r-linux-tdep.o remote-m32r-sdi.o glibc-tdep.o solib.o solib-svr4.o symfile-mem.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/m32r/libsim.a
diff --git a/gdb/config/m32r/m32r.mt b/gdb/config/m32r/m32r.mt
index ff6def0..a8587d2 100644
--- a/gdb/config/m32r/m32r.mt
+++ b/gdb/config/m32r/m32r.mt
@@ -1,4 +1,2 @@
 # Target: Renesas m32r processor
 TDEPFILES= m32r-tdep.o monitor.o m32r-rom.o dsrec.o remote-m32r-sdi.o
-SIM_OBS = remote-sim.o
-SIM = ../sim/m32r/libsim.a
diff --git a/gdb/config/m68hc11/m68hc11.mt b/gdb/config/m68hc11/m68hc11.mt
index 0f1f001..2b4f674 100644
--- a/gdb/config/m68hc11/m68hc11.mt
+++ b/gdb/config/m68hc11/m68hc11.mt
@@ -1,5 +1,2 @@
 # Target: Motorola 68HC11 processor
 TDEPFILES= m68hc11-tdep.o
-SIM_OBS= remote-sim.o
-SIM= ../sim/m68hc11/libsim.a -lm
-
diff --git a/gdb/config/mips/embed.mt b/gdb/config/mips/embed.mt
index fb2a45b..c4663c6 100644
--- a/gdb/config/mips/embed.mt
+++ b/gdb/config/mips/embed.mt
@@ -1,3 +1 @@
 TDEPFILES= mips-tdep.o
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
diff --git a/gdb/config/mips/linux.mt b/gdb/config/mips/linux.mt
index f45d647..b61246d 100644
--- a/gdb/config/mips/linux.mt
+++ b/gdb/config/mips/linux.mt
@@ -1,6 +1,3 @@
 # Target: Linux/MIPS
 TDEPFILES= mips-tdep.o mips-linux-tdep.o corelow.o \
 	solib.o solib-svr4.o symfile-mem.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
diff --git a/gdb/config/mips/nbsd.mt b/gdb/config/mips/nbsd.mt
index 04dbc7c..d7efec7 100644
--- a/gdb/config/mips/nbsd.mt
+++ b/gdb/config/mips/nbsd.mt
@@ -1,6 +1,3 @@
 # Target: MIPS running NetBSD
 TDEPFILES= mips-tdep.o mipsnbsd-tdep.o corelow.o solib.o solib-svr4.o \
 	nbsd-tdep.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
diff --git a/gdb/config/mn10300/mn10300.mt b/gdb/config/mn10300/mn10300.mt
index ad1bc8d..faefd03 100644
--- a/gdb/config/mn10300/mn10300.mt
+++ b/gdb/config/mn10300/mn10300.mt
@@ -1,4 +1,2 @@
 # Target: Matsushita mn10300
 TDEPFILES= mn10300-tdep.o 
-SIM_OBS = remote-sim.o
-SIM = ../sim/mn10300/libsim.a
diff --git a/gdb/config/powerpc/linux.mt b/gdb/config/powerpc/linux.mt
index 863ebb4..d958f5b 100644
--- a/gdb/config/powerpc/linux.mt
+++ b/gdb/config/powerpc/linux.mt
@@ -1,6 +1,3 @@
 # Target: Motorola PPC on Linux
 TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o solib.o \
 	solib-svr4.o corelow.o symfile-mem.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/ppc/libsim.a
diff --git a/gdb/config/powerpc/nbsd.mt b/gdb/config/powerpc/nbsd.mt
index 6aa2970..124c82b 100644
--- a/gdb/config/powerpc/nbsd.mt
+++ b/gdb/config/powerpc/nbsd.mt
@@ -1,6 +1,3 @@
 # Target: NetBSD/powerpc
 TDEPFILES= rs6000-tdep.o ppc-sysv-tdep.o ppcnbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/ppc/libsim.a
diff --git a/gdb/config/sh/embed.mt b/gdb/config/sh/embed.mt
index 68acb27..732ac65 100644
--- a/gdb/config/sh/embed.mt
+++ b/gdb/config/sh/embed.mt
@@ -1,5 +1,2 @@
 # Target: Embedded Renesas Super-H with ICE and simulator
 TDEPFILES= sh-tdep.o sh64-tdep.o monitor.o dsrec.o 
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/sh/libsim.a
diff --git a/gdb/config/sh/linux.mt b/gdb/config/sh/linux.mt
index a04e7fa..be75932 100644
--- a/gdb/config/sh/linux.mt
+++ b/gdb/config/sh/linux.mt
@@ -2,6 +2,3 @@
 TDEPFILES= sh-tdep.o sh64-tdep.o sh-linux-tdep.o \
 	monitor.o dsrec.o \
 	solib.o solib-svr4.o symfile-mem.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/sh/libsim.a
diff --git a/gdb/config/sh/nbsd.mt b/gdb/config/sh/nbsd.mt
index 6812a78..03424ab 100644
--- a/gdb/config/sh/nbsd.mt
+++ b/gdb/config/sh/nbsd.mt
@@ -1,6 +1,3 @@
 # Target: NetBSD/sh
 TDEPFILES= sh-tdep.o shnbsd-tdep.o \
 	corelow.o solib.o solib-svr4.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/sh/libsim.a
diff --git a/gdb/config/sh/sh64.mt b/gdb/config/sh/sh64.mt
index 5afe876..5700ded 100644
--- a/gdb/config/sh/sh64.mt
+++ b/gdb/config/sh/sh64.mt
@@ -1,5 +1,2 @@
 # Target: Renesas/Super-H 64 bit with simulator
 TDEPFILES= sh-tdep.o sh64-tdep.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/sh64/libsim.a
diff --git a/gdb/config/sparc/embed.mt b/gdb/config/sparc/embed.mt
index 5d3039c..a0873c5 100644
--- a/gdb/config/sparc/embed.mt
+++ b/gdb/config/sparc/embed.mt
@@ -1,5 +1,2 @@
 # Target: SPARC embedded with simulator
 TDEPFILES= sparc-tdep.o
-
-SIM_OBS = remote-sim.o
-SIM = ../sim/erc32/libsim.a
diff --git a/gdb/config/v850/v850.mt b/gdb/config/v850/v850.mt
index 701a240..2d2cd2d 100644
--- a/gdb/config/v850/v850.mt
+++ b/gdb/config/v850/v850.mt
@@ -1,4 +1,2 @@
 # Target: NEC V850 processor
 TDEPFILES= v850-tdep.o
-SIM_OBS = remote-sim.o
-SIM = ../sim/v850/libsim.a
diff --git a/gdb/config/xstormy16/xstormy16.mt b/gdb/config/xstormy16/xstormy16.mt
index c4b5751..20ee310 100644
--- a/gdb/config/xstormy16/xstormy16.mt
+++ b/gdb/config/xstormy16/xstormy16.mt
@@ -1,5 +1,2 @@
 # Target: Sanyo Xstormy16a processor
 TDEPFILES = xstormy16-tdep.o
-# No simulator objects or libraries are needed -- target uses SID.
-# SIM_OBS = remote-sim.o
-# SIM = ../sim/xstormy16/libsim.a
diff --git a/gdb/configure b/gdb/configure
index 4d89161..72cf6e3 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -313,7 +313,7 @@ ac_includes_default="\
 ac_subdirs_all="$ac_subdirs_all gdbtk"
 ac_subdirs_all="$ac_subdirs_all multi-ice"
 ac_subdirs_all="$ac_subdirs_all gdbserver"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir PACKAGE subdirs AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_CC TCL_DEFS TCL_SHLIB_CFLAGS TCL_SHLIB_LD TCL_SHLIB_LD_LIBS TCL_SHLIB_SUFFIX TCL_DL_LIBS TCL_LD_FLAGS TCL_LD_SEARCH_FLAGS TCL_CC_SEARCH_FLAGS TCL_COMPAT_OBJS TCL_RANLIB TCL_BUILD_LIB_SPEC TCL_LIB_SPEC TCL_LIB_VERSIONS_OK TK_VERSION TK_DEFS TK_BUILD_INCLUDES TK_XINCLUDES TK_XLIBSW TK_BUILD_LIB_SPEC TK_LIB_SPEC TCLHDIR TKHDIR ITCLHDIR ITKHDIR ITCL_VERSION ITCL_DEFS ITCL_BUILD_INCLUDES ITCL_BUILD_LIB_SPEC ITCL_LIB_SPEC ITK_VERSION ITK_DEFS ITK_BUILD_INCLUDES ITK_BUILD_LIB_SPEC ITK_LIB_SPEC X_CFLAGS X_LDFLAGS X_LIBS TCL_DEPS TK_DEPS ITCLLIB ITCL_DEPS ITKLIB ITK_DEPS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR IGNORE_SIM IGNORE_SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBICONV LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir PACKAGE subdirs AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_CC TCL_DEFS TCL_SHLIB_CFLAGS TCL_SHLIB_LD TCL_SHLIB_LD_LIBS TCL_SHLIB_SUFFIX TCL_DL_LIBS TCL_LD_FLAGS TCL_LD_SEARCH_FLAGS TCL_CC_SEARCH_FLAGS TCL_COMPAT_OBJS TCL_RANLIB TCL_BUILD_LIB_SPEC TCL_LIB_SPEC TCL_LIB_VERSIONS_OK TK_VERSION TK_DEFS TK_BUILD_INCLUDES TK_XINCLUDES TK_XLIBSW TK_BUILD_LIB_SPEC TK_LIB_SPEC TCLHDIR TKHDIR ITCLHDIR ITKHDIR ITCL_VERSION ITCL_DEFS ITCL_BUILD_INCLUDES ITCL_BUILD_LIB_SPEC ITCL_LIB_SPEC ITK_VERSION ITK_DEFS ITK_BUILD_INCLUDES ITK_BUILD_LIB_SPEC ITK_LIB_SPEC X_CFLAGS X_LDFLAGS X_LIBS TCL_DEPS TK_DEPS ITCLLIB ITCL_DEPS ITKLIB ITK_DEPS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBICONV LIBOBJS LTLIBOBJS'
 ac_subst_files='host_makefile_frag target_makefile_frag'
 
 # Initialize some variables set by options.
@@ -23887,7 +23887,7 @@ echo "$as_me: WARNING: no enhanced curses library found; disabling TUI" >&2;}
 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
@@ -23911,17 +23911,18 @@ 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"
 
 cat >>confdefs.h <<\_ACEOF
 #define WITH_SIM 1
 _ACEOF
 
+  fi
 fi
 
 
@@ -25084,8 +25085,8 @@ s,@ITK_DEPS@,$ITK_DEPS,;t t
 s,@GDBTKLIBS@,$GDBTKLIBS,;t t
 s,@GDBTK_CFLAGS@,$GDBTK_CFLAGS,;t t
 s,@GDBTK_SRC_DIR@,$GDBTK_SRC_DIR,;t t
-s,@IGNORE_SIM@,$IGNORE_SIM,;t t
-s,@IGNORE_SIM_OBS@,$IGNORE_SIM_OBS,;t t
+s,@SIM@,$SIM,;t t
+s,@SIM_OBS@,$SIM_OBS,;t t
 s,@ENABLE_CFLAGS@,$ENABLE_CFLAGS,;t t
 s,@PROFILE_CFLAGS@,$PROFILE_CFLAGS,;t t
 s,@CONFIG_OBS@,$CONFIG_OBS,;t t
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)
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 9c77fb1..e24835c 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -4,6 +4,7 @@
 # This file sets the following shell variables:
 #  gdb_target_cpu	generic name of CPU
 #  gdb_target		name of GDB target definition to use
+#  gdb_sim		simulator library for target
 #  gdb_osabi		default OS ABI to use with target
 #  build_gdbserver	set to "yes" if gdbserver supports target
 
@@ -100,10 +101,15 @@ arm*-*-openbsd*)
 	;;
 arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
 	gdb_target=embed
+	gdb_sim=../sim/arm/libsim.a
 	;;
 
 avr-*-*)
 	gdb_target=avr
+	# There is no simulator provided with gdb (yet).
+	# See <http://savannah.gnu.org/projects/simulavr/>
+	# for the simulator used during development of avr
+	# support for gdb.
 	;;
 
 cris*)
@@ -112,10 +118,12 @@ cris*)
 
 frv-*-*)
 	gdb_target=frv
+	gdb_sim=../sim/frv/libsim.a
 	;;
 
 h8300-*-*)
 	gdb_target=h8300
+	gdb_sim=../sim/h8300/libsim.a
 	;;
 
 hppa*-*-hpux*)
@@ -178,22 +186,29 @@ ia64*-*-*)
 
 iq2000-*-*)
 	gdb_target=iq2000
+	gdb_sim=../sim/iq2000/libsim.a
 	;;
 
 m32c-*-*)
 	gdb_target=m32c
+	# There may also be a SID / CGEN simulator for this,
+	# but we do have DJ Delorie's mini-sim.
+	gdb_sim=../sim/m32c/libsim.a
 	;;
 
 m32r*-*-linux*)
 	gdb_target=linux
+	gdb_sim=../sim/m32r/libsim.a
 	build_gdbserver=yes
 	;;
 m32r*-*-*)
 	gdb_target=m32r
+	gdb_sim=../sim/m32r/libsim.a
 	;;
 
 m68hc11*-*-*|m6811*-*-*)
 	gdb_target=m68hc11
+	gdb_sim=../sim/m68hc11/libsim.a
 	;;
 
 m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | m68*-*-uclinux* | \
@@ -227,20 +242,24 @@ mips*-sgi-irix6*)
 	;;
 mips*-*-linux*)
 	gdb_target=linux
+	gdb_sim=../sim/mips/libsim.a
 	build_gdbserver=yes
 	;;
 mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
 	gdb_target=nbsd
+	gdb_sim=../sim/mips/libsim.a
 	;;
 mips64*-*-openbsd*)
 	gdb_target=obsd64
 	;;
 mips*-*-*)
 	gdb_target=embed
+	gdb_sim=../sim/mips/libsim.a
 	;;
 
 mn10300-*-*)
 	gdb_target=mn10300
+	gdb_sim=../sim/mn10300/libsim.a
 	;;
 
 mt-*-*)
@@ -249,6 +268,7 @@ mt-*-*)
 
 powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
 	gdb_target=nbsd
+	gdb_sim=../sim/ppc/libsim.a
 	;;
 powerpc-*-openbsd*)
 	gdb_target=obsd
@@ -258,13 +278,13 @@ powerpc-*-aix* | rs6000-*-*)
 	;;
 powerpc-*-linux* | powerpc64-*-linux*)
 	gdb_target=linux
+	gdb_sim=../sim/ppc/libsim.a
 	build_gdbserver=yes
 	;;
 powerpc*-*-*)
+	gdb_target=ppc-eabi
 	if test -f ../sim/ppc/Makefile; then
-	  gdb_target=ppc-sim
-	else
-	  gdb_target=ppc-eabi
+	  gdb_sim=../sim/ppc/libsim.a
 	fi
 	;;
 
@@ -280,19 +300,23 @@ score-*-*)
 # FIXME should that be sh*-*-linux*, perhaps?
 sh-*-linux*)
 	gdb_target=linux
+	gdb_sim=../sim/sh/libsim.a
 	build_gdbserver=yes
 	;;
 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
 	gdb_target=nbsd
+	gdb_sim=../sim/sh/libsim.a
 	;;
 sh*-*-openbsd*)
 	gdb_target=obsd
 	;;
 sh64-*-elf*)
 	gdb_target=sh64
+	gdb_sim=../sim/sh64/libsim.a
 	;;
 sh*)
 	gdb_target=embed
+	gdb_sim=../sim/sh/libsim.a
 	;;
 
 sparc-*-linux*)
@@ -324,6 +348,7 @@ sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
 	;;
 sparc-*-rtems*)
 	gdb_target=embed
+	gdb_sim=../sim/erc32/libsim.a
 	;;
 sparc-*-*)
 	gdb_target=sparc
@@ -339,10 +364,12 @@ spu*-*-*)
 
 xstormy16-*-*)
 	gdb_target=xstormy16
+	# No simulator libraries are needed -- target uses SID.
 	;;
 
 v850*-*-elf)
 	gdb_target=v850
+	gdb_sim=../sim/v850/libsim.a
 	;;
 
 vax-*-netbsd* | vax-*-knetbsd*-gnu)