(link_command_spec): Undo patch of May 11.

-nostdlib implies -nostartfiles again.
New argument -nodefaultlibs.

From-SVN: r9932

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 2a1d277fc107c1ef811c028827f0d48934d370bb..0cd4f50b494ab3d68c379f35d1d4a4b9920738a2 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -719,18 +719,20 @@ static char *link_command_spec = "\
 %{!fsyntax-only: \
  %{!c:%{!M:%{!MM:%{!E:%{!S:ld %l %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} \
                        %{r} %{s} %{t} %{u*} %{x} %{z} %{Z}\
-                       %{!A:%{!nostartfiles:%S}} %{static:}\
-                       %{L*} %{T*} %o %{!nostdlib:%G %L %G}\
-                       %{!A:%{!nostartfiles:%E}}\n }}}}}}";
+                       %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
+                       %{static:} %{L*} %{T*} %o\
+                       %{!nostdlib:%{!nodefaultlibs:%G %L %G}}\
+                       %{!A:%{!nostdlib:%{!nostartfiles:%E}}}\n }}}}}}";
 #else
 /* Use -L.  */
 static char *link_command_spec = "\
 %{!fsyntax-only: \
  %{!c:%{!M:%{!MM:%{!E:%{!S:ld %l %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} \
                        %{r} %{s} %{t} %{u*} %{x} %{z} %{Z}\
-                       %{!A:%{!nostartfiles:%S}} %{static:}\
-                       %{L*} %D %{T*} %o %{!nostdlib:%G %L %G}\
-                       %{!A:%{!nostartfiles:%E}}\n }}}}}}";
+                       %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
+                       %{static:} %{L*} %D %{T*} %o\
+                       %{!nostdlib:%{!nodefaultlibs:%G %L %G}}\
+                       %{!A:%{!nostdlib:%{!nostartfiles:%E}}}\n }}}}}}";
 #endif
 
 /* A vector of options to give to the linker.