Another attempt at fixing the i686-mingw32-RA-on-linux buildbot.

llvm-svn: 256901

llvm/lib/Support/Windows/WindowsSupport.h

@@ -49,11 +49,12 @@
 #include <vector>
 
 #if !defined(__CYGWIN__) && \
-    !(defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))
+    !(defined(__MINGW32__) && defined(__MINGW64_VERSION_MAJOR) && \
+      __MINGW64_VERSION_MAJOR < 3)
 #include <VersionHelpers.h>
 #else
 // Cygwin does not have the IsWindows8OrGreater() API.
-// Mingw32 does not have the API either (but mingw-w64 does).
+// Older version of mingw-w64 does not have the API either.
 inline bool IsWindows8OrGreater() {
   OSVERSIONINFO osvi = {};
   osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);