diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a071c33b0d..31e02a93340 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-20  Jason Merrill  <jason@redhat.com>
+
+	* config/i386/cygwin.h (DWARF2_UNWIND_INFO): Define to 0.
+
 2002-03-20  Michael Meissner  <meissner@redhat.com>
 
 	* doc/invoke.texi (Optimize Options): Document that -O2 sets
diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h
index aa05518ae46..43e5bf4be3b 100644
--- a/gcc/config/i386/cygwin.h
+++ b/gcc/config/i386/cygwin.h
@@ -409,6 +409,11 @@ extern void i386_pe_unique_section PARAMS ((TREE, int));
 #undef ASM_COMMENT_START
 #define ASM_COMMENT_START " #"
 
+/* DWARF2 Unwinding doesn't work with exception handling yet.  To make
+   it work, we need to build a libgcc_s.dll, and dcrt0.o should be
+   changed to call __register_frame_info/__deregister_frame_info.  */
+#define DWARF2_UNWIND_INFO 0
+
 /* Don't assume anything about the header files.  */
 #define NO_IMPLICIT_EXTERN_C