From ce51475dc5971e6d30e7a1265c73c534dac48af6 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Mon, 9 Jul 2012 23:00:50 -0400
Subject: [PATCH] bug 380598: MinGW 64bit toolchain not detected.

---
 .../gnu/mingw/MingwEnvironmentVariableSupplier.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
index 79fb3eadc96..c5dcb3c01a0 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
@@ -127,6 +127,14 @@ public class MingwEnvironmentVariableSupplier implements IConfigurationEnvironme
 			return mingwBinDir;
 		}
 
+		// Check for MinGW-w64 on Windows 64 bit, see http://mingw-w64.sourceforge.net/
+		if (Platform.ARCH_X86_64.equals(Platform.getOSArch())) {
+			IPath gcc64Loc = PathUtil.findProgramLocation("x86_64-w64-mingw32-gcc.exe", envPathValueCached); //$NON-NLS-1$
+			if (gcc64Loc != null) {
+				return gcc64Loc.removeLastSegments(1);
+			}
+		}
+
 		// Look in PATH values. Look for mingw32-gcc.exe
 		// TODO: Since this dir is already in the PATH, why are we adding it here?
 		// This is really only to support isToolchainAvail. Must be a better way.