diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e372e745002a..a4224e46ef9e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* config/i386/cygming.h (TARGET_OS_CPP_BUILTINS): Define
+	__GXX_MERGED_TYPEINFO_NAMES to 0.
+
 2004-10-17  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	* cfgrtl.c (rtl_verify_flow_info_1): When checking insns in a bb,
diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h
index a54e8a9718b9..be77abadc6cf 100644
--- a/gcc/config/i386/cygming.h
+++ b/gcc/config/i386/cygming.h
@@ -86,6 +86,9 @@ Boston, MA 02111-1307, USA.  */
 	    builtin_define ("_fastcall=__attribute__((__fastcall__))");	\
 	    builtin_define ("_cdecl=__attribute__((__cdecl__))");	\
 	  }								\
+	/* Even though linkonce works with static libs, this is needed 	\
+	    to compare typeinfo symbols across dll boundaries.  */	\
+	builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0");		\
 	MAYBE_UWIN_CPP_BUILTINS ();					\
 	EXTRA_OS_CPP_BUILTINS ();					\
   }									\