Bug 531125 - Tupled gcc toolchains should not be the local default

- change ToolChainManager so that when creating the types map for
  the first time, make it a LinkedHashMap instead of HashMap so
  order of input is preserved (first in = first out)
- fix GCCPathToolChainProvider so that it adds non-tupled gcc
  to the ToolChainManger before adding any tupled version

Change-Id: I84602a98dd4949a2f9847d4e72c428cdedd60688

1 files changed, 2 insertions, 1 deletions

diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/ToolChainManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/ToolChainManager.java
index 9129c2d5a9a..efebaa9c02f 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/ToolChainManager.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/build/ToolChainManager.java
@@ -11,6 +11,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -133,7 +134,7 @@ public class ToolChainManager implements IToolChainManager {
 	public void addToolChain(IToolChain toolChain) {
 		Map<String, IToolChain> type = toolChains.get(toolChain.getTypeId());
 		if (type == null) {
-			type = new HashMap<>();
+			type = new LinkedHashMap<>(); // use LinkedHashMap so input order is maintained
 			toolChains.put(toolChain.getTypeId(), type);
 		}
 		type.put(toolChain.getId(), toolChain);