diff --git a/gcc/config/i386/freebsd.h b/gcc/config/i386/freebsd.h
index 570f57a9dd0..102cb948134 100644
--- a/gcc/config/i386/freebsd.h
+++ b/gcc/config/i386/freebsd.h
@@ -225,7 +225,7 @@ do {                                                                    \
 
 #define ASM_SPEC   " %| %{fpic:-k} %{fPIC:-k}"
 #define LINK_SPEC \
-  "%{!nostartfiles:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} %{assert*}"
+  "%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} %{assert*}"
 
 /* This is defined when gcc is compiled in the BSD-directory-tree, and must
  * make up for the gap to all the stuff done in the GNU-makefiles.
diff --git a/gcc/config/i386/sun.h b/gcc/config/i386/sun.h
index e9c325219de..a27b14c6f7d 100644
--- a/gcc/config/i386/sun.h
+++ b/gcc/config/i386/sun.h
@@ -35,7 +35,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef LINK_SPEC
 #define LINK_SPEC \
-  "%{!nostartfiles:%{!r*:%{!e*:-e _start}}} -dc -dp %{static:-Bstatic}"
+  "%{!nostdlib:%{!r*:%{!e*:-e _start}}} -dc -dp %{static:-Bstatic}"
 
 /* Extra switches to give the assembler.  */
 
diff --git a/gcc/config/m68k/sun2o4.h b/gcc/config/m68k/sun2o4.h
index d895f55a3d5..6ae0ca8bc2a 100644
--- a/gcc/config/m68k/sun2o4.h
+++ b/gcc/config/m68k/sun2o4.h
@@ -93,7 +93,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef LINK_SPEC
 #define LINK_SPEC \
-  "%{!nostartfiles:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic}"
+  "%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic}"
 
 #undef ASM_OUTPUT_DOUBLE
 #define ASM_OUTPUT_DOUBLE(FILE,VALUE)					\
diff --git a/gcc/config/m68k/sun3.h b/gcc/config/m68k/sun3.h
index 5530ae870b2..9ebdec26416 100644
--- a/gcc/config/m68k/sun3.h
+++ b/gcc/config/m68k/sun3.h
@@ -151,7 +151,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Provide required defaults for linker -e and -d switches.  */
 
 #define LINK_SPEC \
- "%{!nostartfiles:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} %{assert*}"
+ "%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} %{assert*}"
 
 /* Every structure or union's size must be a multiple of 2 bytes.  */
 
diff --git a/gcc/config/m68k/vxm68k.h b/gcc/config/m68k/vxm68k.h
index d649359cb38..121c057277c 100644
--- a/gcc/config/m68k/vxm68k.h
+++ b/gcc/config/m68k/vxm68k.h
@@ -46,7 +46,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Provide required defaults for linker -e. */
  
-#define LINK_SPEC "%{!nostartfiles:%{!r*:%{!e*:-e start}}}"
+#define LINK_SPEC "%{!nostdlib:%{!r*:%{!e*:-e start}}}"
 
 /* VxWorks provides the functionality of crt0.o and friends itself.  */
 
diff --git a/gcc/config/mips/netbsd.h b/gcc/config/mips/netbsd.h
index db42f96b1a8..6f34ad458da 100644
--- a/gcc/config/mips/netbsd.h
+++ b/gcc/config/mips/netbsd.h
@@ -49,7 +49,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef LINK_SPEC
 #define LINK_SPEC \
   "%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \
-   %{!nostartfiles:%{!r*:%{!e*:-e __start}}} -dc -dp %{static:-Bstatic} %{assert*}"
+   %{!nostdlib:%{!r*:%{!e*:-e __start}}} -dc -dp %{static:-Bstatic} %{assert*}"
 
 /* We have atexit(3).  */
 
diff --git a/gcc/config/netbsd.h b/gcc/config/netbsd.h
index d7264d002d9..8c0974ade4d 100644
--- a/gcc/config/netbsd.h
+++ b/gcc/config/netbsd.h
@@ -58,7 +58,7 @@
 
 #undef LINK_SPEC
 #define LINK_SPEC \
-  "%{!nostartfiles:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} %{assert*}"
+  "%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp %{static:-Bstatic} %{assert*}"
 
 
 /* We have atexit(3).  */
diff --git a/gcc/config/rs6000/mach.h b/gcc/config/rs6000/mach.h
index 667054a3571..81a2efc5c53 100644
--- a/gcc/config/rs6000/mach.h
+++ b/gcc/config/rs6000/mach.h
@@ -29,7 +29,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Define different binder options for MACH.  */
 #undef LINK_SPEC
 #define LINK_SPEC \
- "-T0x10000000 -D0x20000000 -K %{!nostartfiles:%{!r*:%{!e*:-e __start}}} \
+ "-T0x10000000 -D0x20000000 -K %{!nostdlib:%{!r*:%{!e*:-e __start}}} \
   -bnoso -berrmsg -btextro -bhalt:4 -bnodelcsect"
 
 /* MACH doesn't have atexit.  */
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index ebc932deb48..202f3a56b80 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -65,7 +65,7 @@ extern enum arch_type sparc_arch_type;
 /* Provide required defaults for linker -e and -d switches.  */
 
 #define LINK_SPEC \
- "%{!shared:%{!nostartfiles:%{!r*:%{!e*:-e start}}} -dc -dp} %{static:-Bstatic} \
+ "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e start}}} -dc -dp} %{static:-Bstatic} \
   %{assert*} %{shared:-assert pure-text}"
 
 /* Special flags to the Sun-4 assembler when using pipe for input.  */
diff --git a/gcc/config/sparc/vxsparc.h b/gcc/config/sparc/vxsparc.h
index e672c2f18b4..fbb14c83df1 100644
--- a/gcc/config/sparc/vxsparc.h
+++ b/gcc/config/sparc/vxsparc.h
@@ -28,7 +28,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Provide required defaults for linker -e. */
 #undef LINK_SPEC
-#define LINK_SPEC "%{!nostartfiles:%{!r*:%{!e*:-e start}}}"
+#define LINK_SPEC "%{!nostdlib:%{!r*:%{!e*:-e start}}}"
 
 /* VxWorks provides the functionality of crt0.o and friends itself.  */
 #undef STARTFILE_SPEC