diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c905ae80e68e..a70318841ae2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-21  Richard Sandiford  <rsandifo@nildram.co.uk>
+
+	* gcc.target/mips/mips.exp (setup_mips_tests): Fix _MIPS_SIM
+	conditions.
+	(dg-mips-options): Treat -march=24k* as a 32-bit option.
+
 2007-12-20  Jack Howarth  <howarth@bromo.med.uc.edu>
 
 	* gcc.dg/torture/builtin-modf-1.c: Pass "-funsafe-math-optimizations 
diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp
index 7a542065376b..07f642bb61a3 100644
--- a/gcc/testsuite/gcc.target/mips/mips.exp
+++ b/gcc/testsuite/gcc.target/mips/mips.exp
@@ -93,11 +93,11 @@ proc setup_mips_tests {} {
 	#endif
 	#if !defined _MIPS_SIM
 	const char *abi = "eabi";
-	#elif _MIPS_SIM=_ABIO32
+	#elif _MIPS_SIM==_ABIO32
 	const char *abi = "32";
-	#elif _MIPS_SIM=_ABIO64
+	#elif _MIPS_SIM==_ABIO64
 	const char *abi = "o64";
-	#elif _MIPS_SIM=_ABIN32
+	#elif _MIPS_SIM==_ABIN32
 	const char *abi = "n32";
 	#else
 	const char *abi = "64";
@@ -242,6 +242,7 @@ proc dg-mips-options {args} {
 	    -mips[12] -
 	    -mips32* -
 	    -march=mips32* -
+	    -march=24k* -
 	    -mabi=32 -
 	    -mgp32 {
 		set mips_new_gp 32