diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bcc9e4bf6ba..5c0ab9cfa38 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+1999-12-01  Mark Salter <msalter@cygnus.com>
+
+	* config/mips/elf.h (STARTFILE_SPEC): Add no-crt0.
+	* config/mips/elf64.h (STARTFILE_SPEC): Add no-crt0.
+	* config/mips/mips.h (TARGET_SWITCHES): Add no-crt0.
+
 Tue Nov 30 15:20:52 MET 1999  Jan Hubicka  <hubicka@freesoft.cz>
 
 	* i386.c (ix86_expand_move): Never add clobbers to move patterns.
diff --git a/gcc/config/mips/elf.h b/gcc/config/mips/elf.h
index 690b005f4b1..9299ac819a3 100644
--- a/gcc/config/mips/elf.h
+++ b/gcc/config/mips/elf.h
@@ -358,7 +358,7 @@ func_ptr __DTOR_END__[1] = { (func_ptr) 0 };
 #define LIB_SPEC ""
 
 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crtbegin%O%s crt0%O%s"
+#define STARTFILE_SPEC "crtbegin%O%s %{!mno-crt0:crt0%O%s}"
 
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend%O%s"
diff --git a/gcc/config/mips/elf64.h b/gcc/config/mips/elf64.h
index 248dd32637c..5d6632e1c5f 100644
--- a/gcc/config/mips/elf64.h
+++ b/gcc/config/mips/elf64.h
@@ -338,7 +338,7 @@ func_ptr __DTOR_END__[1] = { (func_ptr) 0 };
 #define LIB_SPEC ""
 
 #undef  STARTFILE_SPEC
-#define STARTFILE_SPEC "crtbegin%O%s crt0%O%s"
+#define STARTFILE_SPEC "crtbegin%O%s %{!mno-crt0:crt0%O%s}"
 
 #undef  ENDFILE_SPEC
 #define ENDFILE_SPEC "crtend%O%s"
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index e792226a623..0f54a8f9bff 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -329,6 +329,8 @@ extern void		sbss_section PARAMS ((void));
 
 #define TARGET_SWITCHES							\
 {									\
+  {"no-crt0",          0,                                               \
+     "No default crt0.o" },					 	\
   {"int64",		  MASK_INT64 | MASK_LONG64,			\
      "Use 64-bit int type"},						\
   {"long64",		  MASK_LONG64,					\