diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
index a420c8f565b..6a128f5c517 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugConfiguration.java
@@ -66,10 +66,11 @@ public class DebugConfiguration implements ICDebugConfiguration {
 
 	public boolean supportsCPU(String cpu) {
 		String nativeCPU = BootLoader.getOSArch();
+		boolean ret = false;
 		if ( nativeCPU.startsWith(cpu) ) {
-			cpu = NATIVE;
+			ret = getCPUs().contains(NATIVE);
 		}
-		return getCPUs().contains(cpu);
+		return ret || getCPUs().contains(cpu);
 	}
 	/**
 	 * Returns the set of modes specified in the configuration data.