File gcc-4.4.2-static_libstdcxx.patch of Package mingw64-gcc

Overview Repositories Revisions Requests Users Attributes Meta

File gcc-4.4.2-static_libstdcxx.patch of Package mingw64-gcc (Revision cd88b69ffd0df00f8cfed923bc979454)

Currently displaying revision cd88b69ffd0df00f8cfed923bc979454 , Show latest

--- gcc/cp/g++spec.c	2009-02-20 16:20:38.000000000 +0100
+++ gcc/cp/g++spec.c	2009-10-30 20:48:59.000000000 +0100
@@ -30,6 +30,8 @@
 #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"
@@ -45,7 +47,7 @@
 #define LIBSTDCXX_PROFILE LIBSTDCXX
 #endif
 #ifndef LIBSTDCXX_STATIC
-#define LIBSTDCXX_STATIC LIBSTDCXX
+#define LIBSTDCXX_STATIC NULL
 #endif
 
 void
@@ -60,10 +62,11 @@
   /* 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 +99,9 @@
   /* 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;
 
@@ -200,9 +206,15 @@
 		 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
@@ -259,8 +271,9 @@
   shared_libgcc = 0;
 #endif
 
-  /* Make sure to have room for the trailing NULL argument.  */
-  num_args = argc + added + need_math + shared_libgcc + (library > 0) + 1;
+  /* 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) * 4 + 2;
   arglist = XNEWVEC (const char *, num_args);
 
   i = 0;
@@ -311,6 +324,9 @@
 	  arglist[j] = "-xnone";
 	}
 
+      if ((args[i] & SKIPOPT) != 0)
+	--j;
+
       i++;
       j++;
     }
@@ -318,11 +334,32 @@
   /* Add `-lstdc++' if we haven't already done so.  */
   if (library > 0)
     {
-      arglist[j] = shared_libgcc == 0 ? LIBSTDCXX_STATIC
-	: saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX;
+#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 ((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;
@@ -335,7 +372,7 @@
     }
   if (saw_libc)
     arglist[j++] = saw_libc;
-  if (shared_libgcc)
+  if (shared_libgcc && !static_link)
     arglist[j++] = "-shared-libgcc";
 
   arglist[j] = NULL;

Places

File gcc-4.4.2-static_libstdcxx.patch of Package mingw64-gcc (Revision cd88b69ffd0df00f8cfed923bc979454)

Places