diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0d5634b3fb12b4dc625e88eea091e1a03f6577ea..c2c483e9925567147bed253d7ad7de9ecdb6039e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-30  Richard Sandiford  <richard@codesourcery.com>
+
+	* config/mips/linux64.h (DRIVER_SELF_SPECS): Use a single spec,
+	but with each set of options separated by spaces.
+
 2006-10-30  J"orn Rennecke  <joern.rennecke@st.com>
 
 	* unwind-dw2.c (uw_init_context_1): Fix test that checks if
diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
index 8c189ffa9cbefcb25446a080bec2ac4bcaa01e36..92e326eaf1b2ca8da74a77249ec38c55043d807b 100644
--- a/gcc/config/mips/linux64.h
+++ b/gcc/config/mips/linux64.h
@@ -24,8 +24,8 @@ Boston, MA 02110-1301, USA.  */
 #undef DRIVER_SELF_SPECS
 #define DRIVER_SELF_SPECS \
 NO_SHARED_SPECS \
-"%{!EB:%{!EL:%(endian_spec)}}", \
-"%{!mabi=*: -mabi=n32}"
+" %{!EB:%{!EL:%(endian_spec)}}" \
+" %{!mabi=*: -mabi=n32}"
 
 #undef SUBTARGET_ASM_SPEC
 #define SUBTARGET_ASM_SPEC "\