Backport from mainline:

	2004-10-28  Nick Clifton  <nickc@redhat.com>
	* baseboards/iq2000-sim.exp: New file.

	2004-06-08  Alexandre Oliva  <aoliva@redhat.com>
	* baseboards/mn10300-sim.exp: Set needs_status_wrapper and
	noresults to zero.

	2004-05-13  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
	* baseboards/m32r-linux-sim.exp: Add New file.

4 files changed, 86 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c37505f..02191ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-07-01  Ben Elliston  <bje@gnu.org>
+
+	Backport from mainline:
+
+	2004-10-28  Nick Clifton  <nickc@redhat.com>
+	* baseboards/iq2000-sim.exp: New file.
+
+	2004-06-08  Alexandre Oliva  <aoliva@redhat.com>
+	* baseboards/mn10300-sim.exp: Set needs_status_wrapper and
+	noresults to zero.
+
+	2004-05-13  Kazuhiro Inaoka  <inaoka.kazuhiro@renesas.com>
+	* baseboards/m32r-linux-sim.exp: Add New file.
+
 2005-06-24  Ben Elliston  <bje@gnu.org>
 
 	* MAINTAINERS: Update my email address.
diff --git a/baseboards/iq2000-sim.exp b/baseboards/iq2000-sim.exp
new file mode 100644
index 0000000..276b867
--- /dev/null
+++ b/baseboards/iq2000-sim.exp
@@ -0,0 +1,36 @@
+# This is a list of toolchains that are supported on this board.
+set_board_info target_install {iq2000-elf}
+
+# Load the generic configuration for this board. This will define a basic set
+# of routines needed by the tool to communicate with the board.
+load_generic_config "sim"
+
+# basic-sim.exp is a basic description for the standard Cygnus simulator.
+load_base_board_description "basic-sim"
+
+# "iq2000" is the name of the sim subdir in devo/sim.
+setup_sim iq2000
+
+# No multilib options needed by default.
+process_multilib_options ""
+
+# We only support newlib on this target. We assume that all multilib
+# options have been specified before we get here.
+
+set_board_info compiler  "[find_gcc]"
+set_board_info cflags    "[libgloss_include_flags] [newlib_include_flags]"
+set_board_info ldflags   "[libgloss_link_flags] [newlib_link_flags]"
+# Special linker script needed to run C programs.
+set_board_info ldscript "-Tsim.ld"
+
+# The simulator doesn't return exit statuses and we need to indicate this
+# the standard GCC wrapper will work with this target.
+set_board_info needs_status_wrapper  1
+# Doesn't pass arguments or handle signals, 
+# Can return results.
+# Does do inferiorio.
+set_board_info noargs 1
+set_board_info gcc,no_trampolines 1
+set_board_info gcc,no_label_values 1
+set_board_info gdb,nosignals 1
+
diff --git a/baseboards/m32r-linux-sim.exp b/baseboards/m32r-linux-sim.exp
new file mode 100644
index 0000000..441df48
--- /dev/null
+++ b/baseboards/m32r-linux-sim.exp
@@ -0,0 +1,34 @@
+# This is a list of toolchains that are supported on this board.
+set_board_info target_install {m32r-linux}
+
+# Load the generic configuration for this board. This will define a basic set
+# of routines needed by the tool to communicate with the board.
+load_generic_config "sim"
+
+# basic-sim.exp is a basic description for the standard Cygnus simulator.
+load_base_board_description "basic-sim"
+
+# "m32r" is the name of the sim subdir.
+setup_sim m32r
+
+# No multilib options needed by default.
+process_multilib_options ""
+
+# We only support newlib on this target. We assume that all multilib
+# options have been specified before we get here.
+
+set_board_info compiler  "[find_gcc]"
+set_board_info cflags    ""
+set_board_info ldflags   "-static"
+# No linker script needed.
+set_board_info ldscript ""
+
+# The simulator doesn't return exit statuses and we need to indicate this
+# the standard GCC wrapper will work with this target.
+set_board_info needs_status_wrapper  1
+# Doesn't pass arguments or signals, can't return results, and doesn't
+# do inferiorio.
+set_board_info noargs 1
+set_board_info gdb,nosignals 1
+set_board_info gdb,noresults 1
+set_board_info gdb,noinferiorio 1
diff --git a/baseboards/mn10300-sim.exp b/baseboards/mn10300-sim.exp
index 3be6d51..6c92904 100644
--- a/baseboards/mn10300-sim.exp
+++ b/baseboards/mn10300-sim.exp
@@ -46,13 +46,13 @@ set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags]"
 set_board_info ldscript "-Tsim.ld"
 
 # The simulator doesn't return exit statuses and we need to indicate this.
-set_board_info needs_status_wrapper  1
+set_board_info needs_status_wrapper  0
 
 # We can't pass args to the simulator or get exit status back from the
 # simulator, nor does the simulator support real signals.
 set_board_info noargs  1
 set_board_info gdb,nosignals  1
-set_board_info gdb,noresults  1
+set_board_info gdb,noresults  0
 set_board_info gdb,noinferiorio  1
 
 # Used by a few gcc.c-torture testcases to delimit how large the stack can