diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 495702c708cac85ac103e81f175af4efad315735..2bfaaf45ad94912cdc6b3a32d6ed0d5014f347e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-08 Jason Thorpe <thorpej@wasabisystems.com>
+
+ * config/mips/netbsd.h (SUBTARGET_EXTRA_SPECS): Add
+ netbsd_link_spec and netbsd_entry_point.
+ (LINK_SPEC): Use %(netbsd_link_spec).
+ (NETBSD_ENTRY_POINT): Define.
+
2002-06-08 Jason Thorpe <thorpej@wasabisystems.com>
* config/sparc/netbsd-elf.h (LINK_ARCH32_SPEC): Only specify
diff --git a/gcc/config/mips/netbsd.h b/gcc/config/mips/netbsd.h
index 6269b7aad2748d31878011a5480fa01155e8626c..55c1e45984ad0c146ffcaec59caafc092edc1694 100644
--- a/gcc/config/mips/netbsd.h
+++ b/gcc/config/mips/netbsd.h
@@ -118,7 +118,9 @@ Boston, MA 02111-1307, USA. */
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
{ "subtarget_endian_default", SUBTARGET_ENDIAN_DEFAULT_SPEC }, \
- { "netbsd_cpp_spec", NETBSD_CPP_SPEC },
+ { "netbsd_cpp_spec", NETBSD_CPP_SPEC }, \
+ { "netbsd_link_spec", NETBSD_LINK_SPEC_ELF }, \
+ { "netbsd_entry_point", NETBSD_ENTRY_POINT },
#if TARGET_ENDIAN_DEFAULT != 0
#define SUBTARGET_ENDIAN_DEFAULT_SPEC "-D__MIPSEB__"
@@ -136,24 +138,15 @@ Boston, MA 02111-1307, USA. */
the MIPS target. */
#undef LINK_SPEC
-#define LINK_SPEC \
- "%{assert*} %{R*} %{rpath*} \
- %{EL:-m elf32lmip} \
- %{EB:-m elf32bmip} \
- %(endian_spec) \
- %{G*} %{mips1} %{mips2} %{mips3} %{mips4} %{mips32} %{mips64} \
- %{bestGnum} %{call_shared} %{no_archive} %{exact_version} \
- %{shared:-shared} \
- %{!shared: \
- -dc -dp \
- %{!nostdlib: \
- %{!r*: \
- %{!e*:-e __start}}} \
- %{!static: \
- %{rdynamic:-export-dynamic} \
- %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
- %{static:-static}}"
-
+#define LINK_SPEC \
+ "%{EL:-m elf32lmip} \
+ %{EB:-m elf32bmip} \
+ %(endian_spec) \
+ %{G*} %{mips1} %{mips2} %{mips3} %{mips4} %{mips32} %{mips64} \
+ %{bestGnum} %{call_shared} %{no_archive} %{exact_version} \
+ %(netbsd_link_spec)"
+
+#define NETBSD_ENTRY_POINT "__start"
#undef SUBTARGET_ASM_SPEC
#define SUBTARGET_ASM_SPEC \