diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index 74fe6473706..09785eab72b 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -96,7 +96,7 @@ X86TargetLowering::X86TargetLowering(X86TargetMachine &TM)
   setSchedulingPreference(Sched::RegPressure);
   setStackPointerRegisterToSaveRestore(X86StackPtr);
 
-  if (Subtarget->isTargetWindows() && !Subtarget->isTargetCygwin()) {
+  if (Subtarget->isTargetWindows() && !Subtarget->isTargetCygMing()) {
     // Setup Windows compiler runtime calls.
     setLibcallName(RTLIB::SDIV_I64, "_alldiv");
     setLibcallCallingConv(RTLIB::SDIV_I64, CallingConv::X86_StdCall);
diff --git a/test/CodeGen/X86/alldiv-divdi3.ll b/test/CodeGen/X86/alldiv-divdi3.ll
index 250d7d87cee..86aa1fde195 100644
--- a/test/CodeGen/X86/alldiv-divdi3.ll
+++ b/test/CodeGen/X86/alldiv-divdi3.ll
@@ -1,8 +1,9 @@
 ; Test that, for a 64 bit signed div, a libcall to alldiv is made on Windows
-; except for cygwin.
+; unless we have libgcc.
 
 ; RUN: llc < %s -mtriple i386-pc-win32 | FileCheck %s
-; RUN: llc < %s -mtriple i386-pc-cygwin | FileCheck %s -check-prefix CYGWIN
+; RUN: llc < %s -mtriple i386-pc-cygwin | FileCheck %s -check-prefix USEDIVDI
+; RUN: llc < %s -mtriple i386-pc-mingw32 | FileCheck %s -check-prefix USEDIVDI
 
 define i32 @main(i32 %argc, i8** nocapture %argv) nounwind readonly {
 entry:
@@ -13,4 +14,4 @@ entry:
 }
 
 ; CHECK: alldiv
-; CYGWIN: divdi3
+; USEDIVDI: divdi3