* gas/mips/mips.exp (run_dump_test_arch): Get the name of the

	architecture to check against for an architecture-specific test
	from the properties instead of the name passed.

2 files changed, 14 insertions, 4 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2fa3e2b..2c6f78c 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2010-10-18  Maciej W. Rozycki  <macro@linux-mips.org>
 
+	* gas/mips/mips.exp (run_dump_test_arch): Get the name of the
+	architecture to check against for an architecture-specific test
+	from the properties instead of the name passed.
+
+2010-10-18  Maciej W. Rozycki  <macro@linux-mips.org>
+
 	* gas/mips/lineno.s: Convert to o32.
 	* gas/mips/lineno.d: Adjust patterns accordingly.  Force the o32
 	ABI.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 024e404..bbbc0bb 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -194,9 +194,12 @@ proc mips_arch_displayname {arch} {
 # mips_arch_properties ARCH (optional:) INCLUDE_GPRSIZE
 #
 # This function returns the property list associated with ARCH in the
-# architecture data array.  If INCLUDE_GPRSIZE is non-zero, an additional
-# "gpr32" or "gpr64" property will be returned as part of the list based
-# on the architecture's GPR size.
+# architecture data array, including the "canonical" target name as the
+# first element.
+#
+# If INCLUDE_GPRSIZE is non-zero, an additional "gpr32" or "gpr64"
+# property will be returned as part of the list based on the
+# architecture's GPR size.
 proc mips_arch_properties {arch {include_gprsize 1}} {
     array set archdata [mips_arch_data $arch]
     set props $archdata(props)
@@ -286,7 +289,8 @@ proc mips_arch_list_matching {args} {
 proc run_dump_test_arch { name arch } {
     global subdir srcdir
 
-    set archname "${arch}@${name}"
+    set proparch [lindex [mips_arch_properties $arch 0] 0]
+    set archname "${proparch}@${name}"
     if { [file exists "$srcdir/$subdir/${archname}.d"] } {
 	set name $archname
     }