* tree.h (TREE_ADDRESSABLE): Remove bogus usage for FIELD_DECL.

[pf3gnuchains/gcc-fork.git] / gcc / cp / g++spec.c

diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c
index f49d699..2853088 100644 (file)
--- a/gcc/cp/g++spec.c
+++ b/gcc/cp/g++spec.c
@@ -1,6 +1,6 @@
 /* Specific flags and argument handling of the C++ front end.
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2007, 2008  Free Software Foundation, Inc.
+   2007, 2008, 2009 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -30,6 +30,8 @@ along with GCC; see the file COPYING3.  If not see
 #define MATHLIB                (1<<2)
 /* This bit is set if they did `-lc'.  */
 #define WITHLIBC       (1<<3)
+/* Skip this option.  */
+#define SKIPOPT                (1<<4)
 
 #ifndef MATH_LIBRARY
 #define MATH_LIBRARY "-lm"
@@ -57,13 +59,11 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   /* If nonzero, the user gave us the `-p' or `-pg' flag.  */
   int saw_profile_flag = 0;
 
-  /* If nonzero, the user gave us the `-v' flag.  */
-  int saw_verbose_flag = 0;
-
-  /* This is a tristate:
+  /* What do with libstdc++:
      -1 means we should not link in libstdc++
      0  means we should link in libstdc++ if it is needed
-     1  means libstdc++ is needed and should be linked in.  */
+     1  means libstdc++ is needed and should be linked in.
+     2  means libstdc++ is needed and should be linked statically.  */
   int library = 0;
 
   /* The number of arguments being added to what's in argv, other than
@@ -96,6 +96,9 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   /* By default, we throw on the math library if we have one.  */
   int need_math = (MATH_LIBRARY[0] != '\0');
 
+  /* True if we saw -static.  */
+  int static_link = 0;
+
   /* True if we should add -shared-libgcc to the command-line.  */
   int shared_libgcc = 1;
 
@@ -147,8 +150,6 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
            args[i] |= WITHLIBC;
          else if (strcmp (argv[i], "-pg") == 0 || strcmp (argv[i], "-p") == 0)
            saw_profile_flag++;
-         else if (strcmp (argv[i], "-v") == 0)
-           saw_verbose_flag = 1;
          else if (strncmp (argv[i], "-x", 2) == 0)
            {
              const char * arg;
@@ -200,9 +201,15 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
                 cause a warning.  */
              library = -1;
            }
-         else if (strcmp (argv[i], "-static-libgcc") == 0
-                  || strcmp (argv[i], "-static") == 0)
+         else if (strcmp (argv[i], "-static") == 0)
+           static_link = 1;
+         else if (strcmp (argv[i], "-static-libgcc") == 0)
            shared_libgcc = 0;
+         else if (strcmp (argv[i], "-static-libstdc++") == 0)
+           {
+             library = library >= 0 ? 2 : library;
+             args[i] |= SKIPOPT;
+           }
          else if (DEFAULT_WORD_SWITCH_TAKES_ARG (&argv[i][1]))
            i++;
          else
@@ -261,7 +268,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
 
   /* Make sure to have room for the trailing NULL argument.
      Add one for shared_libgcc or extra static library.  */
-  num_args = argc + added + need_math + (library > 0) + 2;
+  num_args = argc + added + need_math + (library > 0) * 4 + 2;
   arglist = XNEWVEC (const char *, num_args);
 
   i = 0;
@@ -312,6 +319,9 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
          arglist[j] = "-xnone";
        }
 
+      if ((args[i] & SKIPOPT) != 0)
+       --j;
+
       i++;
       j++;
     }
@@ -319,18 +329,32 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   /* Add `-lstdc++' if we haven't already done so.  */
   if (library > 0)
     {
+#ifdef HAVE_LD_STATIC_DYNAMIC
+      if (library > 1 && !static_link)
+       {
+         arglist[j] = "-Wl,-Bstatic";
+         j++;
+       }
+#endif
       arglist[j] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX;
       if (arglist[j][0] != '-' || arglist[j][1] == 'l')
        added_libraries++;
       j++;
-    }
-  /* Add target-dependent static library, if necessary.  */
-  if (shared_libgcc == 0 && LIBSTDCXX_STATIC != NULL)
-    {
-      arglist[j] = LIBSTDCXX_STATIC;
-      if (arglist[j][0] != '-' || arglist[j][1] == 'l')
-       added_libraries++;
-      j++;
+      /* Add target-dependent static library, if necessary.  */
+      if ((static_link || library > 1) && LIBSTDCXX_STATIC != NULL)
+       {
+         arglist[j] = LIBSTDCXX_STATIC;
+         if (arglist[j][0] != '-' || arglist[j][1] == 'l')
+           added_libraries++;
+         j++;
+       }
+#ifdef HAVE_LD_STATIC_DYNAMIC
+      if (library > 1 && !static_link)
+       {
+         arglist[j] = "-Wl,-Bdynamic";
+         j++;
+       }
+#endif
     }
   if (saw_math)
     arglist[j++] = saw_math;
@@ -343,7 +367,7 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
     }
   if (saw_libc)
     arglist[j++] = saw_libc;
-  if (shared_libgcc)
+  if (shared_libgcc && !static_link)
     arglist[j++] = "-shared-libgcc";
 
   arglist[j] = NULL;