re PR target/42818 (Static C++ linking breakage "undefined reference to ___real__Znwj...

	PR target/42818
	* config/i386/cygwin.h (CXX_WRAP_SPEC_LIST): Always apply wrappers,
	even when linking statically, for now.

From-SVN: r156105

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4ec8ee68706d9712e39761b593220c738b23fe07..8b18dbd4c32e650218f757b7aab2344555aa6678 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-21  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       PR target/42818
+       * config/i386/cygwin.h (CXX_WRAP_SPEC_LIST): Always apply wrappers,
+       even when linking statically, for now.
+
 2010-01-20  Alexandre Oliva  <aoliva@redhat.com>
 
        PR debug/42715

diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index 86eff635ae6d201bc04d6c00d12b18b0e3ba5093..0a395c64ecc2b166804d4dd60b63276d243bf525 100644 (file)
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -87,7 +87,7 @@ along with GCC; see the file COPYING3.  If not see
 
 /* To implement C++ function replacement we always wrap the cxx
    malloc-like operators.  See N2800 #17.6.4.6 [replacement.functions] */
-#define CXX_WRAP_SPEC_LIST "%{!static: %{!static-libstdc++: \
+#define CXX_WRAP_SPEC_LIST " \
   --wrap _Znwj \
   --wrap _Znaj \
   --wrap _ZdlPv \
@@ -96,7 +96,7 @@ along with GCC; see the file COPYING3.  If not see
   --wrap _ZnajRKSt9nothrow_t \
   --wrap _ZdlPvRKSt9nothrow_t \
   --wrap _ZdaPvRKSt9nothrow_t \
-  }}"
+"
 
 #if defined (USE_CYGWIN_LIBSTDCXX_WRAPPERS)