diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61170da27331..60be46405c31 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-13  Richard Sandiford  <richard@codesourcery.com>
+
+	* config/mips/vxworks.h (SUBTARGET_OVERRIDE_OPTIONS): Define.
+	* config/mips/mips.c (override_options): Call
+	SUBTARGET_OVERRIDE_OPTIONS, if defined.
+
 2007-04-13  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/i386/i386.opt (msvr3-shlib): Removed.
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index b67210934ae2..880934b949de 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -4719,6 +4719,10 @@ override_options (void)
   int i, start, regno;
   enum machine_mode mode;
 
+#ifdef SUBTARGET_OVERRIDE_OPTIONS
+  SUBTARGET_OVERRIDE_OPTIONS;
+#endif
+
   mips_section_threshold = g_switch_set ? g_switch_value : MIPS_DEFAULT_GVALUE;
 
   /* The following code determines the architecture and register size.
diff --git a/gcc/config/mips/vxworks.h b/gcc/config/mips/vxworks.h
index 5b6b026e9c45..c72c105db9e0 100644
--- a/gcc/config/mips/vxworks.h
+++ b/gcc/config/mips/vxworks.h
@@ -89,3 +89,6 @@ VXWORKS_LINK_SPEC
 
 #undef SUBTARGET_ASM_SPEC
 #define SUBTARGET_ASM_SPEC "%{mrtp:%{fPIC|fpic:-mvxworks-pic}}"
+
+#undef SUBTARGET_OVERRIDE_OPTIONS
+#define SUBTARGET_OVERRIDE_OPTIONS VXWORKS_OVERRIDE_OPTIONS