* gcc.c (init_gcc_specs): Get -static and -static-libgcc to

override -shared and -shared-libgcc.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50171 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 16b0f84..77693f3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-28  Alexandre Oliva  <aoliva@redhat.com>
+
+       * gcc.c (init_gcc_specs): Get -static and -static-libgcc to
+       override -shared and -shared-libgcc.
+
 2002-02-28  David O'Brien  <obrien@FreeBSD.org>
 
        * config.gcc (sparc64-*-freebsd): Explicitly accept a cpu specification

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 4001c0d..a911793 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1414,18 +1414,18 @@ init_gcc_specs (obstack, shared_name, static_name, eh_name)
 {
   char *buf;
 
-  buf = concat ("%{!shared:%{!shared-libgcc:", static_name, " ",
+  buf = concat ("%{static|static-libgcc:", static_name, " ", eh_name,
+               "}%{!static:%{!static-libgcc:",
+               "%{!shared:%{!shared-libgcc:", static_name, " ",
                eh_name, "}%{shared-libgcc:", shared_name, " ",
-               static_name, "}}",
-               "%{shared:%{static-libgcc:", static_name, " ",
-               eh_name, "}%{!static-libgcc:",
+               static_name, "}}%{shared:",
 #ifdef LINK_EH_SPEC
                "%{shared-libgcc:", shared_name,
                "}%{!shared-libgcc:", static_name, "}",
 #else
                shared_name,
 #endif
-               "}}", NULL);
+               "}}}", NULL);
 
   obstack_grow (obstack, buf, strlen (buf));
   free (buf);