diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d80a5f7173a..cfd32ecf22c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-24  Chris Demetriou  <cgd@broadcom.com>
+
+	* config/mips/elf.h (STARTFILE_SPEC): Undo previous change.
+	* config/mips/elf64.h (STARTFILE_SPEC): Likewise.
+	* config/mips/isa3264.h (STARTFILE_SPEC): Likewise.
+
 2002-07-24  Richard Henderson  <rth@redhat.com>
 
 	* expr.c (expand_expr) [TRY_FINALLY_EXPR]: Use GOTO_SUBROUTINE_EXPR
diff --git a/gcc/config/mips/elf.h b/gcc/config/mips/elf.h
index 4bb2489cef2..8e22e0bcd6a 100644
--- a/gcc/config/mips/elf.h
+++ b/gcc/config/mips/elf.h
@@ -263,11 +263,8 @@ void FN ()                                                            \
 #undef LIB_SPEC
 #define LIB_SPEC ""
 
-/* Don't link with crt0 files, let the linker start files specify
-   the appropriate crt0 file.  This is overridden by non-embedded
-   targets which wish to provide a crt0.o by default.  */
 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crti%O%s crtbegin%O%s"
+#define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0:crt0%O%s}"
 
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h
index e170dfa3898..7aea6684a76 100644
--- a/gcc/config/mips/elf64.h
+++ b/gcc/config/mips/elf64.h
@@ -237,11 +237,8 @@ void FN ()                                                            \
 #undef LIB_SPEC
 #define LIB_SPEC ""
 
-/* Don't link with crt0 files, let the linker start files specify
-   the appropriate crt0 file.  This is overridden by non-embedded
-   targets which wish to provide a crt0.o by default.  */
 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crti%O%s crtbegin%O%s"
+#define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0:crt0%O%s}"
 
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend%O%s crtn%O%s"
diff --git a/gcc/config/mips/isa3264.h b/gcc/config/mips/isa3264.h
index f71fdc1d4cf..fc2b2894225 100644
--- a/gcc/config/mips/isa3264.h
+++ b/gcc/config/mips/isa3264.h
@@ -36,3 +36,10 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #include "mips/elf.h"
+
+#if MIPS_ABI_DEFAULT == ABI_MEABI
+/* For MEABI, don't link with crt0 files, let the linker start files specify
+   the appropriate crt0 file.  */
+#undef  STARTFILE_SPEC
+#define STARTFILE_SPEC "crti%O%s crtbegin%O%s %{!mno-crt0: }"
+#endif