diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 65f917abf12..98be40aba0a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-06  Eric Botcazou  <ebotcazou@adacore.com>
+            Pascal Obry  <obry@adacore.com>
+
+	* config/i386/cygming.h (DWARF_FRAME_REGISTERS): Redefine.  Use 33
+	in 64-bit mode and 17 otherwise.
+
 2010-11-06  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	PR debug/45939
diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h
index 09ea866c0d7..4ee2a04349e 100644
--- a/gcc/config/i386/cygming.h
+++ b/gcc/config/i386/cygming.h
@@ -84,6 +84,10 @@ along with GCC; see the file COPYING3.  If not see
   (TARGET_64BIT ? dbx64_register_map[(n)]		\
 		: svr4_dbx_register_map[(n)])
 
+/* The MS_ABI changes the set of call-used registers.  */
+#undef DWARF_FRAME_REGISTERS
+#define DWARF_FRAME_REGISTERS (TARGET_64BIT ? 33 : 17)
+
 #ifdef HAVE_GAS_PE_SECREL32_RELOC
 /* Use section relative relocations for debugging offsets.  Unlike
    other targets that fake this by putting the section VMA at 0, PE