diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80c62a41288..6bd278633e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-01  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+	PR target/42609
+	* config/i386/cygwin.h (CXX_WRAP_SPEC): Disable spec when -mno-cygwin.
+
 2010-04-01  Jakub Jelinek  <jakub@redhat.com>
 
 	* dwarf2out.c (output_compilation_unit_header): For
diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index 0a395c64ecc..bb43d4fb11e 100644
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -108,7 +108,7 @@ along with GCC; see the file COPYING3.  If not see
 #define CXX_WRAP_SPEC_OPT "muse-libstdc-wrappers"
 #endif
 
-#define CXX_WRAP_SPEC "%{" CXX_WRAP_SPEC_OPT ":" CXX_WRAP_SPEC_LIST "}"
+#define CXX_WRAP_SPEC "%{!mno-cygwin:%{" CXX_WRAP_SPEC_OPT ":" CXX_WRAP_SPEC_LIST "}}"
 
 #else /* !defined (USE_CYGWIN_LIBSTDCXX_WRAPPERS)  */