* 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.

22 files changed, 0 insertions, 69 deletions

diff --git a/gdb/config/arm/embed.mt b/gdb/config/arm/embed.mt
index 4fe01478d69..19b12364755 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 0354a421101..4587d3eec2d 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 8f15051d9b4..da3c00b45bc 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 9e579be26ef..d23ee8e2e6d 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 8d5dfb815cb..347acc71d5f 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 2a404d45b6a..a282bfbcf60 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 e27fc67075e..fccbaa13371 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 ff6def0cdb4..a8587d20487 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 0f1f0019eaa..2b4f6747ee7 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 fb2a45b8274..c4663c65f2a 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 f45d647a214..b61246d9a23 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 04dbc7c084b..d7efec75dfd 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 ad1bc8d7e27..faefd03404f 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 863ebb46c35..d958f5b76f3 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 6aa29704163..124c82b64cb 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 68acb270a04..732ac6560db 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 a04e7fa368c..be759320474 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 6812a787573..03424ab3e04 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 5afe876e0eb..5700ded478a 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 5d3039c0120..a0873c5e573 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 701a24098b0..2d2cd2d55eb 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 c4b57514f85..20ee31033f5 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