diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb8e9dfc545..7cafa394c69 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-08  Jason Thorpe  <thorpej@wasabisystems.com>
+
+	* config/netbsd-elf.h (LINK_SPEC): Rename to...
+	(NETBSD_LINK_SPEC_ELF): ...this.  Use %(netbsd_entry_point)
+	to specify program entry point.
+
 2002-06-07  Jeff Law <law@redhat.com
 
 	* emit-rtl.c (init_emit): Add hard registers to regno_reg_rtx.
diff --git a/gcc/config/netbsd-elf.h b/gcc/config/netbsd-elf.h
index 6e69e80fa6f..40ed3aa0798 100644
--- a/gcc/config/netbsd-elf.h
+++ b/gcc/config/netbsd-elf.h
@@ -67,18 +67,22 @@ Boston, MA 02111-1307, USA.  */
 
 /* Provide a LINK_SPEC appropriate for NetBSD ELF.  Here we provide
    support for the special GCC options -assert, -R, -rpath, -shared,
-   -nostdlib, -static, -rdynamic, and -dynamic-linker.  */
+   -nostdlib, -static, -rdynamic, and -dynamic-linker.
 
-#undef LINK_SPEC
-#define LINK_SPEC							\
-  "%{assert*} %{R*} %{rpath*}						\
-   %{shared:-shared}							\
-   %{!shared:								\
-     -dc -dp								\
-     %{!nostdlib:							\
-       %{!r*:								\
-	 %{!e*:-e __start}}}						\
-     %{!static:								\
-       %{rdynamic:-export-dynamic}					\
-       %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}}	\
+   Target-specific code can use this in conjunction with any other
+   target-specific LINK_SPEC options.
+
+   Target-specific code must provide the %(netbsd_entry_point) spec.  */
+
+#define NETBSD_LINK_SPEC_ELF \
+  "%{assert*} %{R*} %{rpath*} \
+   %{shared:-shared} \
+   %{!shared: \
+     -dc -dp \
+     %{!nostdlib: \
+       %{!r*: \
+	 %{!e*:-e %(netbsd_entry_point)}}} \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+       %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \
      %{static:-static}}"