diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 373ebf7eca49..bddc4a614f3e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-11  Richard Sandiford  <richard@codesourcery.com>
+
+	* config/mips/mips.h (MIPS_ISA_LEVEL_SPEC): Handle -m4ksc and
+	-m4ksd.
+	* config/mips/mips.c (mips_cpu_info_table): Mention MIPS_ISA_LEVEL_SPEC
+	in the comment.
+
 2007-07-11  Eric Botcazou  <ebotcazou@adacore.com>
 
 	PR tree-optimization/32713
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index e3100d16d0a7..319a87192de0 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -723,7 +723,8 @@ const struct attribute_spec mips_attribute_table[] =
    taken as the canonical name for that ISA.
 
    To ease comparison, please keep this table in the same order as
-   gas's mips_cpu_info_table[].  */
+   gas's mips_cpu_info_table[].  Please also make sure that
+   MIPS_ISA_LEVEL_SPEC handles all -march options correctly.  */
 const struct mips_cpu_info mips_cpu_info_table[] = {
   /* Entries for generic ISAs */
   { "mips1", PROCESSOR_R3000, 1 },
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 38c8edaea7cd..5c58806b63b3 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -586,8 +586,8 @@ extern const struct mips_rtx_cost_data *mips_cost;
      %{march=mips2|march=r6000:-mips2} \
      %{march=mips3|march=r4*|march=vr4*|march=orion:-mips3} \
      %{march=mips4|march=r8000|march=vr5*|march=rm7000|march=rm9000:-mips4} \
-     %{march=mips32|march=4kc|march=4km|march=4kp:-mips32} \
-     %{march=mips32r2|march=m4k|march=4ke*|march=24k* \
+     %{march=mips32|march=4kc|march=4km|march=4kp|march=4ksc:-mips32} \
+     %{march=mips32r2|march=m4k|march=4ke*|march=4ksd|march=24k* \
        |march=34k*|march=74k*: -mips32r2} \
      %{march=mips64|march=5k*|march=20k*|march=sb1*|march=sr71000: -mips64}}"