2009-01-20 Joel Sherrill <joel.sherrill@oarcorp.com>

	* dejagnu/boards/rtems-arm-edb7312.exp,
	dejagnu/boards/rtems-arm-nosim.exp,
	dejagnu/boards/rtems-avr-avrtest.exp,
	dejagnu/boards/rtems-bfin-nosim.exp,
	dejagnu/boards/rtems-h8300-h8sim.exp,
	dejagnu/boards/rtems-i386-qemu.exp,
	dejagnu/boards/rtems-m32c-m32csim.exp,
	dejagnu/boards/rtems-m32r-m32rsim.exp,
	dejagnu/boards/rtems-m68k-nosim.exp,
	dejagnu/boards/rtems-mips-jmr3904.exp,
	dejagnu/boards/rtems-powerpc-psim.exp,
	dejagnu/boards/rtems-sh-simsh1.exp,
	dejagnu/boards/rtems-sparc-sis.exp,
	gcc/testsuite/ada/acats/Makefile.rtems: Eliminate version specific
	file names.

13 files changed, 26 insertions, 26 deletions

diff --git a/dejagnu/boards/rtems-arm-edb7312.exp b/dejagnu/boards/rtems-arm-edb7312.exp
index 0f3952c..7d2fc3e 100755
--- a/dejagnu/boards/rtems-arm-edb7312.exp
+++ b/dejagnu/boards/rtems-arm-edb7312.exp
@@ -26,7 +26,7 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
+# wrapper script which handles the device tree
 set_board_info sim "edb7312"
 
 # No support for signals on this target.
diff --git a/dejagnu/boards/rtems-arm-nosim.exp b/dejagnu/boards/rtems-arm-nosim.exp
index 6323f2e..c8f82a1 100755
--- a/dejagnu/boards/rtems-arm-nosim.exp
+++ b/dejagnu/boards/rtems-arm-nosim.exp
@@ -26,8 +26,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "sis-4.9 "
+# wrapper script which handles the device tree
+set_board_info sim "nosim "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-avr-avrtest.exp b/dejagnu/boards/rtems-avr-avrtest.exp
index 57c05bc..265a7fd 100755
--- a/dejagnu/boards/rtems-avr-avrtest.exp
+++ b/dejagnu/boards/rtems-avr-avrtest.exp
@@ -26,8 +26,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "sis-4.9 "
+# wrapper script which handles the device tree
+set_board_info sim "sis "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-bfin-nosim.exp b/dejagnu/boards/rtems-bfin-nosim.exp
index 4b74d91..cbc67f7 100755
--- a/dejagnu/boards/rtems-bfin-nosim.exp
+++ b/dejagnu/boards/rtems-bfin-nosim.exp
@@ -26,8 +26,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "sis-4.9 "
+# wrapper script which handles the device tree
+set_board_info sim "nosim "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-h8300-h8sim.exp b/dejagnu/boards/rtems-h8300-h8sim.exp
index dd6862c..aa34d6b 100755
--- a/dejagnu/boards/rtems-h8300-h8sim.exp
+++ b/dejagnu/boards/rtems-h8300-h8sim.exp
@@ -27,8 +27,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "h8sim-4.10 "
+# wrapper script which handles the device tree
+set_board_info sim "h8sim "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-i386-qemu.exp b/dejagnu/boards/rtems-i386-qemu.exp
index e5a9576..d7cf910 100755
--- a/dejagnu/boards/rtems-i386-qemu.exp
+++ b/dejagnu/boards/rtems-i386-qemu.exp
@@ -45,7 +45,7 @@ set_board_info isremote 0
 # We only have a small stack available to us
 # set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
+# wrapper script which handles the device tree
 set_board_info sim "runqemu"
 
 # No support for signals on this target.
diff --git a/dejagnu/boards/rtems-m32c-m32csim.exp b/dejagnu/boards/rtems-m32c-m32csim.exp
index 75a3f50..700f035 100755
--- a/dejagnu/boards/rtems-m32c-m32csim.exp
+++ b/dejagnu/boards/rtems-m32c-m32csim.exp
@@ -26,8 +26,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "m32crun "
+# wrapper script which handles the device tree
+set_board_info sim "m32csim "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-m32r-m32rsim.exp b/dejagnu/boards/rtems-m32r-m32rsim.exp
index 44ef5ba..6388e2e 100755
--- a/dejagnu/boards/rtems-m32r-m32rsim.exp
+++ b/dejagnu/boards/rtems-m32r-m32rsim.exp
@@ -26,8 +26,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "m32rrun "
+# wrapper script which handles the device tree
+set_board_info sim "m32rsim "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-m68k-nosim.exp b/dejagnu/boards/rtems-m68k-nosim.exp
index 57c05bc..aaeb818 100755
--- a/dejagnu/boards/rtems-m68k-nosim.exp
+++ b/dejagnu/boards/rtems-m68k-nosim.exp
@@ -26,8 +26,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "sis-4.9 "
+# wrapper script which handles the device tree
+set_board_info sim "nosim "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-mips-jmr3904.exp b/dejagnu/boards/rtems-mips-jmr3904.exp
index 8699de8..aa2806d 100755
--- a/dejagnu/boards/rtems-mips-jmr3904.exp
+++ b/dejagnu/boards/rtems-mips-jmr3904.exp
@@ -29,8 +29,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# jmr3904-4.9 is a wrapper script which handles setup
-set_board_info sim "jmr3904-4.9 "
+# wrapper script which handles the device tree
+set_board_info sim "jmr3904 "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-powerpc-psim.exp b/dejagnu/boards/rtems-powerpc-psim.exp
index 300c191..3267adf 100755
--- a/dejagnu/boards/rtems-powerpc-psim.exp
+++ b/dejagnu/boards/rtems-powerpc-psim.exp
@@ -28,7 +28,7 @@ load_generic_config "sim"
 load_base_board_description "basic-sim"
 
 # The name of the simulator is "ppc".
-setup_sim psim-4.9
+setup_sim psim
 
 # No multilib flags needed by default.
 process_multilib_options ""
@@ -47,8 +47,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "psim-4.9 -l 180"
+# wrapper script which handles the device tree
+set_board_info sim "psim -l 180"
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-sh-simsh1.exp b/dejagnu/boards/rtems-sh-simsh1.exp
index b7aa681..a730ddd 100755
--- a/dejagnu/boards/rtems-sh-simsh1.exp
+++ b/dejagnu/boards/rtems-sh-simsh1.exp
@@ -26,8 +26,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "simsh-4.10 "
+# wrapper script which handles the device tree
+set_board_info sim "simsh "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1
diff --git a/dejagnu/boards/rtems-sparc-sis.exp b/dejagnu/boards/rtems-sparc-sis.exp
index 10c2eeb..c5e8c3f 100755
--- a/dejagnu/boards/rtems-sparc-sis.exp
+++ b/dejagnu/boards/rtems-sparc-sis.exp
@@ -10,7 +10,7 @@ load_generic_config "sim"
 load_base_board_description "basic-sim"
 
 # The name of the simulator is "ppc".
-setup_sim sis-4.9
+setup_sim sis
 
 # No multilib flags needed by default.
 process_multilib_options ""
@@ -27,8 +27,8 @@ set_board_info isremote 0
 # We only have a small stack available to us
 set_board_info gcc,stack_size 2048
 
-# psim-4.9 is a wrapper script which handles the device tree
-set_board_info sim "sis-4.9 "
+# wrapper script which handles the device tree
+set_board_info sim "sis "
 
 # No support for signals on this target.
 set_board_info gdb,nosignals 1