From 21cabe93769004e6061b7502206c8b7e0fce7e7a Mon Sep 17 00:00:00 2001
From: Liviu Ionescu <ilg@livius.net>
Date: Thu, 10 Oct 2013 21:07:58 +0300
Subject: [PATCH] explicit inits for target options; no more toolchain index,
 use hash(name); echo default tool to avoid initial error; ? required for
 enums initialised by hand

---
 .../plugin.xml                                |  18 ++-
 .../managedbuild/cross/Option.java            |   2 +-
 .../cross/SetCrossCommandOperation.java       |  41 +++---
 .../cross/SetCrossCommandWizardPage.java      | 124 +++++++++++-------
 .../cross/ToolchainDefinition.java            |  59 ++++++---
 .../ToolchainsManagedOptionValueHandler.java  |  17 ++-
 .../managedbuild/cross/Utils.java             |  54 ++++++--
 7 files changed, 201 insertions(+), 114 deletions(-)

diff --git a/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml b/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml
index 338e5c094..307c8c97c 100644
--- a/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml
+++ b/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml
@@ -659,7 +659,6 @@
                valueType="includePath">
          </option>
          <option
-               defaultValue="-fmessage-length=0"
                id="ilg.gnuarmeclipse.managedbuild.cross.option.base.compiler.other"
                isAbstract="true"
                name="%option.compiler.other"
@@ -840,6 +839,7 @@
                id="ilg.gnuarmeclipse.managedbuild.cross.option.base.arm.target.family"
                isAbstract="true"
                name="%option.target.arm.family"
+               value="?"
                valueType="enumerated">
             <enablement
                   type="UI_ENABLEMENT|CMD_USAGE">
@@ -1432,6 +1432,7 @@
                isAbstract="true"
                name="%option.target.arm.instructionset"
                tip="Select between generating code that executes in ARM and Thumb states. The default for most configurations is to generate code that executes in ARM state, but the default can be changed by configuring GCC with the --with-mode=state configure option."
+               value="?"
                valueType="enumerated">
             <enablement
                   type="UI_ENABLEMENT|CMD_USAGE">
@@ -1773,6 +1774,7 @@
          <option
                id="ilg.gnuarmeclipse.managedbuild.cross.option.base.aarch64.target.family"
                name="%option.target.aarch64.family"
+               value="?"
                valueType="enumerated">
             <enablement
                   type="UI_ENABLEMENT|CMD_USAGE">
@@ -1920,6 +1922,7 @@
          <option
                id="ilg.gnuarmeclipse.managedbuild.cross.option.base.aarch64.target.feature.simd"
                name="%option.target.aarch64.feature.simd"
+               value="?"
                valueType="enumerated">
             <enablement
                   type="UI_ENABLEMENT|CMD_USAGE">
@@ -1959,6 +1962,7 @@
          <option
                id="ilg.gnuarmeclipse.managedbuild.cross.option.base.aarch64.target.cmodel"
                name="%option.target.aarch64.cmodel"
+               value="?"
                valueType="enumerated">
             <enablement
                   type="UI_ENABLEMENT|CMD_USAGE">
@@ -1971,22 +1975,22 @@
             </enablement>
             <enumeratedOptionValue
                   command="-mcmodel=tiny"
-                  id="ilg.gnuarmeclipse.managedbuild.cross.option.cross.gnu.aarch64.base.target.cmodel.tiny"
+                  id="ilg.gnuarmeclipse.managedbuild.cross.option.base.aarch64.target.cmodel.tiny"
                   name="%option.target.aarch64.cmodel.tiny">
             </enumeratedOptionValue>
             <enumeratedOptionValue
                   command="-mcmodel=small"
-                  id="ilg.gnuarmeclipse.managedbuild.cross.option.cross.gnu.aarch64.base.target.cmodel.small"
+                  id="ilg.gnuarmeclipse.managedbuild.cross.option.base.aarch64.target.cmodel.small"
                   isDefault="true"
                   name="%option.target.aarch64.cmodel.small">
             </enumeratedOptionValue>
             <enumeratedOptionValue
                   command="-mcmodel=large"
-                  id="ilg.gnuarmeclipse.managedbuild.cross.option.cross.gnu.aarch64.base.target.cmodel.large"
+                  id="ilg.gnuarmeclipse.managedbuild.cross.option.base.aarch64.target.cmodel.large"
                   name="%option.target.aarch64.cmodel.large">
             </enumeratedOptionValue>
             <enumeratedOptionValue
-                  id="ilg.gnuarmeclipse.managedbuild.cross.option.cross.gnu.aarch64.base.target.cmodel.default"
+                  id="ilg.gnuarmeclipse.managedbuild.cross.option.base.aarch64.target.cmodel.default"
                   name="%option.target.aarch64.cmodel.default">
             </enumeratedOptionValue>
          </option>
@@ -2113,7 +2117,6 @@
          </option>
          <option
                category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
-               defaultValue="?"
                id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix"
                isAbstract="false"
                name="%option.toolchain.prefix"
@@ -2132,6 +2135,7 @@
          </option>
          <option
                category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
+               defaultValue="echo"
                id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c"
                isAbstract="false"
                name="%option.toolchain.command.c"
@@ -2141,6 +2145,7 @@
          </option>
          <option
                category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.toolchain"
+               defaultValue="echo"
                id="ilg.gnuarmeclipse.managedbuild.cross.option.command.cpp"
                isAbstract="false"
                name="%option.toolchain.command.cpp"
@@ -2655,7 +2660,6 @@
           </option>
           <option
                 category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.assembler.misc"
-                defaultValue="-c -fmessage-length=0"
                 id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.other"
                 name="%option.assembler.other"
                 valueType="string">
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Option.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Option.java
index cdb139d6c..428f78287 100644
--- a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Option.java
+++ b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Option.java
@@ -492,7 +492,7 @@ public static String getToolChainFlags(IConfiguration config) {
 			sValue = null;
 			if (sFamilyId.endsWith("." + FAMILY_ARM)) {
 				sValue = getArmTargetFlags(config);
-			} else if (sFamilyId.endsWith("." + FAMILY_ARM)) {
+			} else if (sFamilyId.endsWith("." + FAMILY_AARCH64)) {
 				sValue = getAarch64TargetFlags(config);
 			}
 			if (sValue != null && sValue.length() > 0)
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/SetCrossCommandOperation.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/SetCrossCommandOperation.java
index b715a871a..9714fcb79 100644
--- a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/SetCrossCommandOperation.java
+++ b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/SetCrossCommandOperation.java
@@ -62,9 +62,13 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException,
 				SetCrossCommandWizardPage.PAGE_ID,
 				SetCrossCommandWizardPage.CROSS_PROJECT_NAME);
 
-		String toolchainIndex = (String) MBSCustomPageManager.getPageProperty(
+		// String toolchainIndex = (String)
+		// MBSCustomPageManager.getPageProperty(
+		// SetCrossCommandWizardPage.PAGE_ID,
+		// SetCrossCommandWizardPage.CROSS_TOOLCHAIN_INDEX);
+		String toolchainName = (String) MBSCustomPageManager.getPageProperty(
 				SetCrossCommandWizardPage.PAGE_ID,
-				SetCrossCommandWizardPage.CROSS_TOOLCHAIN_INDEX);
+				SetCrossCommandWizardPage.CROSS_TOOLCHAIN_NAME);
 		String path = (String) MBSCustomPageManager.getPageProperty(
 				SetCrossCommandWizardPage.PAGE_ID,
 				SetCrossCommandWizardPage.CROSS_COMMAND_PATH);
@@ -73,14 +77,14 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException,
 		// workspace/.plugins/org.eclipse.cdt.core/shareddefaults.xml
 
 		String pathKey = SetCrossCommandWizardPage.SHARED_CROSS_COMMAND_PATH
-				+ "." + toolchainIndex;
+				+ "." + toolchainName.hashCode();
 		SharedDefaults.getInstance().getSharedDefaultsMap().put(pathKey, path);
 
 		SharedDefaults
 				.getInstance()
 				.getSharedDefaultsMap()
-				.put(SetCrossCommandWizardPage.SHARED_CROSS_TOOLCHAIN_INDEX,
-						toolchainIndex);
+				.put(SetCrossCommandWizardPage.SHARED_CROSS_TOOLCHAIN_NAME,
+						toolchainName);
 		SharedDefaults.getInstance().updateShareDefaultsMap(
 				SharedDefaults.getInstance().getSharedDefaultsMap());
 
@@ -116,32 +120,37 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException,
 			}
 		}
 
-
 		System.out.println("SetCrossCommandOperation.run() end");
 
 	}
 
 	private void updateOptions(IConfiguration config) throws BuildException {
 
-		String sToolchainIndex = (String) MBSCustomPageManager.getPageProperty(
+		String sToolchainName = (String) MBSCustomPageManager.getPageProperty(
 				SetCrossCommandWizardPage.PAGE_ID,
-				SetCrossCommandWizardPage.CROSS_TOOLCHAIN_INDEX);
+				SetCrossCommandWizardPage.CROSS_TOOLCHAIN_NAME);
+
+		int toolchainIndex;
+		try {
+			toolchainIndex = ToolchainDefinition
+					.findToolchainByName(sToolchainName);
+		} catch (IndexOutOfBoundsException e) {
+			toolchainIndex = ToolchainDefinition.getDefault();
+		}
 
-		IToolChain toolchain = config.getToolChain();
-		
 		IOption option;
-		String val;
+		IToolChain toolchain = config.getToolChain();
 
 		String sId;
 		sId = Activator.getOptionPrefix() + ".toolchain.index";
 		option = toolchain.getOptionBySuperClassId(sId); //$NON-NLS-1$
-		val = sId + "." + sToolchainIndex;
+		String val = sId + "." + String.valueOf(toolchainIndex);
 		// Do not use config.setOption() to DO NOT save it on .cproject...
-		// option.setValue(val);
-		config.setOption(toolchain, option, val); // temporarily
+		option.setValue(val);
+		//config.setOption(toolchain, option, val); // temporarily
+
+		Utils.updateOptions(config, toolchainIndex);
 
-		Utils.updateOptions(config, sToolchainIndex);
-		
 		String path = (String) MBSCustomPageManager.getPageProperty(
 				SetCrossCommandWizardPage.PAGE_ID,
 				SetCrossCommandWizardPage.CROSS_COMMAND_PATH);
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/SetCrossCommandWizardPage.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/SetCrossCommandWizardPage.java
index eb9c9ffb0..e82c48f44 100644
--- a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/SetCrossCommandWizardPage.java
+++ b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/SetCrossCommandWizardPage.java
@@ -42,12 +42,13 @@
  */
 public class SetCrossCommandWizardPage extends MBSCustomPage {
 
-	private Composite composite;
-	private boolean finish = false;
-	private Text pathTxt;
+	private Composite m_composite;
+	private boolean m_finish = false;
+	private Text m_pathTxt;
 	// private Text prefixTxt;
-	private Combo toolchainCombo;
-	private int selectedToolchainIndex;
+	private Combo m_toolchainCombo;
+	private int m_selectedToolchainIndex;
+	private String m_selectedToolchainName;
 
 	// must match the plugin.xml <wizardPage ID="">
 	public static final String PAGE_ID = Activator.getPrefix()
@@ -55,14 +56,17 @@ public class SetCrossCommandWizardPage extends MBSCustomPage {
 
 	public static final String CROSS_PROJECT_NAME = "projectName"; //$NON-NLS-1$
 
-	public static final String CROSS_TOOLCHAIN_INDEX = "toolchainIndex"; //$NON-NLS-1$
+	//public static final String CROSS_TOOLCHAIN_INDEX = "toolchainIndex"; //$NON-NLS-1$
+	public static final String CROSS_TOOLCHAIN_NAME = "toolchainName"; //$NON-NLS-1$
 	public static final String CROSS_COMMAND_PATH = "toolchainPath"; //$NON-NLS-1$
 
 	// Note: The shared defaults keys don't have "cross" in them because we want
 	// to keep
 	// compatibility with defaults that were saved when it used to be a template
-	static final String SHARED_CROSS_TOOLCHAIN_INDEX = Activator.getPrefix()
-			+ "." + CROSS_TOOLCHAIN_INDEX;
+	// static final String SHARED_CROSS_TOOLCHAIN_INDEX = Activator.getPrefix()
+	// + "." + CROSS_TOOLCHAIN_INDEX;
+	static final String SHARED_CROSS_TOOLCHAIN_NAME = Activator.getPrefix()
+			+ "." + CROSS_TOOLCHAIN_NAME;
 	static final String SHARED_CROSS_COMMAND_PATH = Activator.getPrefix() + "."
 			+ CROSS_COMMAND_PATH;
 
@@ -71,8 +75,9 @@ public SetCrossCommandWizardPage() {
 
 		// initialise properties in local storage
 		MBSCustomPageManager.addPageProperty(PAGE_ID, CROSS_COMMAND_PATH, ""); //$NON-NLS-1$
-		MBSCustomPageManager
-				.addPageProperty(PAGE_ID, CROSS_TOOLCHAIN_INDEX, ""); //$NON-NLS-1$
+		// MBSCustomPageManager
+		//				.addPageProperty(PAGE_ID, CROSS_TOOLCHAIN_INDEX, ""); //$NON-NLS-1$
+		MBSCustomPageManager.addPageProperty(PAGE_ID, CROSS_TOOLCHAIN_NAME, ""); //$NON-NLS-1$
 	}
 
 	@Override
@@ -81,7 +86,8 @@ protected boolean isCustomPageComplete() {
 		// the project name,
 		// the property will be updated
 		updateProjectNameProperty();
-		return finish;
+		//System.out.println("isCustomPageComplete() "+m_finish);
+		return m_finish;
 	}
 
 	public String getName() {
@@ -89,19 +95,19 @@ public String getName() {
 	}
 
 	public void createControl(Composite parent) {
-		composite = new Composite(parent, SWT.NULL);
+		m_composite = new Composite(parent, SWT.NULL);
 
-		composite.setLayout(new GridLayout(3, false));
+		m_composite.setLayout(new GridLayout(3, false));
 		GridData layoutData = new GridData();
-		composite.setLayoutData(layoutData);
+		m_composite.setLayoutData(layoutData);
 
 		// Toolchain
-		Label toolchainLbl = new Label(composite, SWT.NONE);
+		Label toolchainLbl = new Label(m_composite, SWT.NONE);
 		toolchainLbl.setText(Messages.SetCrossCommandWizardPage_toolchain);
 
-		toolchainCombo = new Combo(composite, SWT.DROP_DOWN);
+		m_toolchainCombo = new Combo(m_composite, SWT.DROP_DOWN);
 		layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-		toolchainCombo.setLayoutData(layoutData);
+		m_toolchainCombo.setLayoutData(layoutData);
 
 		// create the selection array
 		String[] toolchains = new String[ToolchainDefinition.getSize()];
@@ -109,56 +115,67 @@ public void createControl(Composite parent) {
 			toolchains[i] = ToolchainDefinition.getToolchain(i).getName()
 					+ " (" + getSelectedCompilerCommand(i) + ")";
 		}
-		toolchainCombo.setItems(toolchains);
+		m_toolchainCombo.setItems(toolchains);
 
 		// decide which one is selected
 		try {
-			String sSel = (String) SharedDefaults.getInstance()
-					.getSharedDefaultsMap().get(SHARED_CROSS_TOOLCHAIN_INDEX);
-			System.out.println("Previous toolchain index " + sSel);
-			selectedToolchainIndex = Integer.parseInt(sSel);
+			m_selectedToolchainName = (String) SharedDefaults.getInstance()
+					.getSharedDefaultsMap().get(SHARED_CROSS_TOOLCHAIN_NAME);
+			System.out.println("Previous toolchain name "
+					+ m_selectedToolchainName);
+			if (m_selectedToolchainName != null
+					&& m_selectedToolchainName.length() > 0) {
+				m_selectedToolchainIndex = ToolchainDefinition
+						.findToolchainByName(m_selectedToolchainName);
+			} else {
+				m_selectedToolchainIndex = ToolchainDefinition.getDefault();
+				m_selectedToolchainName = ToolchainDefinition.getToolchain(
+						m_selectedToolchainIndex).getName();
+			}
 		} catch (Exception e) {
-			selectedToolchainIndex = 0;
+			m_selectedToolchainIndex = 0;
 		}
-		updateToolchainIndexProperty();
+		updateToolchainNameProperty();
 
-		String toolchainSel = toolchains[selectedToolchainIndex];
-		toolchainCombo.setText(toolchainSel);
+		String toolchainSel = toolchains[m_selectedToolchainIndex];
+		m_toolchainCombo.setText(toolchainSel);
 
-		toolchainCombo.addSelectionListener(new SelectionAdapter() {
+		m_toolchainCombo.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
 				// System.out.println("Combo " + toolchainCombo.getText());
-				selectedToolchainIndex = toolchainCombo.getSelectionIndex();
-				updateToolchainIndexProperty();
-				
+				m_selectedToolchainIndex = m_toolchainCombo.getSelectionIndex();
+				m_selectedToolchainName = ToolchainDefinition.getToolchain(
+						m_selectedToolchainIndex).getName();
+				updateToolchainNameProperty();
+
 				String pathKey = SHARED_CROSS_COMMAND_PATH + "."
-						+ String.valueOf(selectedToolchainIndex);
+						+ m_selectedToolchainName.hashCode();
 				String crossCommandPath = SharedDefaults.getInstance()
 						.getSharedDefaultsMap().get(pathKey);
 				if (crossCommandPath == null) {
 					crossCommandPath = "";
 				}
-				pathTxt.setText(crossCommandPath);
+				m_pathTxt.setText(crossCommandPath);
 
 			}
 		});
 
 		// Path
-		Label label = new Label(composite, SWT.NONE);
+		Label label = new Label(m_composite, SWT.NONE);
 		label.setText(Messages.SetCrossCommandWizardPage_path);
 
-		pathTxt = new Text(composite, SWT.SINGLE | SWT.BORDER);
+		m_pathTxt = new Text(m_composite, SWT.SINGLE | SWT.BORDER);
 		String pathKey = SHARED_CROSS_COMMAND_PATH + "."
-				+ String.valueOf(selectedToolchainIndex);
+				+ m_selectedToolchainName.hashCode();
 		String crossCommandPath = SharedDefaults.getInstance()
 				.getSharedDefaultsMap().get(pathKey);
 		if (crossCommandPath != null) {
-			pathTxt.setText(crossCommandPath);
+			m_pathTxt.setText(crossCommandPath);
 			updatePathProperty();
 		}
 		layoutData = new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1);
-		pathTxt.setLayoutData(layoutData);
-		pathTxt.addModifyListener(new ModifyListener() {
+		m_pathTxt.setLayoutData(layoutData);
+		m_pathTxt.addModifyListener(new ModifyListener() {
 
 			public void modifyText(ModifyEvent e) {
 
@@ -166,7 +183,7 @@ public void modifyText(ModifyEvent e) {
 			}
 		});
 
-		Button button = new Button(composite, SWT.NONE);
+		Button button = new Button(m_composite, SWT.NONE);
 		button.setText(Messages.SetCrossCommandWizardPage_browse);
 		button.addSelectionListener(new SelectionListener() {
 
@@ -174,10 +191,10 @@ public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
 			public void widgetSelected(SelectionEvent e) {
-				DirectoryDialog dirDialog = new DirectoryDialog(composite
+				DirectoryDialog dirDialog = new DirectoryDialog(m_composite
 						.getShell(), SWT.APPLICATION_MODAL);
 				String browsedDirectory = dirDialog.open();
-				pathTxt.setText(browsedDirectory);
+				m_pathTxt.setText(browsedDirectory);
 
 			}
 		});
@@ -186,7 +203,7 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	public Control getControl() {
-		return composite;
+		return m_composite;
 	}
 
 	public String getDescription() {
@@ -223,12 +240,13 @@ public void setTitle(String title) {
 
 	public void setVisible(boolean visible) {
 		if (visible) {
-			finish = true;
+			m_finish = true;
 		}
-		composite.setVisible(visible);
+		m_composite.setVisible(visible);
 	}
 
 	public void dispose() {
+		//System.out.println("dispose() "+m_finish);
 	}
 
 	private String getSelectedCompilerCommand(int index) {
@@ -242,16 +260,22 @@ private String getSelectedCompilerCommand(int index) {
 	 */
 	private void updatePathProperty() {
 		MBSCustomPageManager.addPageProperty(PAGE_ID, CROSS_COMMAND_PATH,
-				pathTxt.getText());
+				m_pathTxt.getText());
 	}
 
-	private void updateToolchainIndexProperty() {
-		// save current toolchain selection as string index
-		String sIndex = String.valueOf(selectedToolchainIndex);
-		MBSCustomPageManager.addPageProperty(PAGE_ID, CROSS_TOOLCHAIN_INDEX,
-				sIndex);
+	private void updateToolchainNameProperty() {
+		// save current toolchain name
+		MBSCustomPageManager.addPageProperty(PAGE_ID, CROSS_TOOLCHAIN_NAME,
+				m_selectedToolchainName);
 	}
 
+	// private void updateToolchainIndexProperty() {
+	// // save current toolchain selection as string index
+	// String sIndex = String.valueOf(m_selectedToolchainIndex);
+	// MBSCustomPageManager.addPageProperty(PAGE_ID, CROSS_TOOLCHAIN_INDEX,
+	// sIndex);
+	// }
+
 	private void updateProjectNameProperty() {
 		IWizardPage[] pages = getWizard().getPages();
 		for (IWizardPage wizardPage : pages) {
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainDefinition.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainDefinition.java
index fc90521ff..aae7e28c3 100644
--- a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainDefinition.java
+++ b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainDefinition.java
@@ -35,7 +35,7 @@ public ToolchainDefinition(String sName, String sPrefix) {
 		m_sName = sName;
 		m_sPrefix = sPrefix;
 		m_sSuffix = "";
-		m_sFamily = "arm32";
+		m_sFamily = "arm";
 		m_cmdMake = "make";
 		m_cmdRm = "rm";
 		m_cmdC = "gcc";
@@ -120,13 +120,11 @@ public String getCmdSize() {
 		return m_cmdSize;
 	}
 
-	public String getFullCmdC()
-	{
+	public String getFullCmdC() {
 		return getPrefix() + getCmdC() + getSuffix();
 	}
-	
-	private void setTest()
-	{
+
+	private void setTest() {
 		m_sSuffix = "mySuffix";
 		m_sFamily = "myFamily";
 		m_cmdMake = "myMake";
@@ -138,14 +136,14 @@ private void setTest()
 		m_cmdObjdump = "myObjdump";
 		m_cmdSize = "mySize";
 	}
+
 	// Static members
 	private static List<ToolchainDefinition> ms_list;
 
-	public static List<ToolchainDefinition> getList()
-	{
+	public static List<ToolchainDefinition> getList() {
 		return ms_list;
 	}
-	
+
 	public static ToolchainDefinition getToolchain(int index) {
 		return ms_list.get(index);
 	}
@@ -158,13 +156,28 @@ public static int getSize() {
 		return ms_list.size();
 	}
 
+	public static int findToolchainByName(String sName) {
+		int i = 0;
+		for (ToolchainDefinition td : ms_list) {
+			if (td.m_sName.equals(sName))
+				return i;
+			i++;
+		}
+		// not found
+		throw new IndexOutOfBoundsException();
+	}
+
+	public static int getDefault() {
+		return 0;
+	}
+
 	// Initialise the list of known toolchains
 	static {
 		ms_list = new ArrayList<ToolchainDefinition>();
-		
+
 		// 0
-		ms_list.add(new ToolchainDefinition("GNU Tools for ARM Embedded Processors",
-				"arm-none-eabi-"));
+		ms_list.add(new ToolchainDefinition(
+				"GNU Tools for ARM Embedded Processors", "arm-none-eabi-"));
 		// 1
 		ToolchainDefinition tc;
 		tc = new ToolchainDefinition("Sourcery CodeBench Lite for ARM EABI",
@@ -174,7 +187,8 @@ public static int getSize() {
 		ms_list.add(tc);
 
 		// 2
-		tc = new ToolchainDefinition("Sourcery CodeBench Lite for ARM GNU/Linux",
+		tc = new ToolchainDefinition(
+				"Sourcery CodeBench Lite for ARM GNU/Linux",
 				"arm-none-linux-gnueabi-");
 		if (Utils.isPlatform("windows"))
 			tc.setWin("cs_make", "cs_rm");
@@ -192,7 +206,8 @@ public static int getSize() {
 				"arm-linux-gnueabihf-"));
 
 		// 6
-		ms_list.add(new ToolchainDefinition("Linaro ARMv7 Big-Endian Linux GNU EABI HF",
+		ms_list.add(new ToolchainDefinition(
+				"Linaro ARMv7 Big-Endian Linux GNU EABI HF",
 				"armeb-linux-gnueabihf-"));
 
 		// 64 bit toolchains
@@ -201,7 +216,8 @@ public static int getSize() {
 				"aarch64-none-elf-", "aarch64"));
 
 		// 8
-		ms_list.add(new ToolchainDefinition("Linaro AArch64 big-endian bare-metal ELF",
+		ms_list.add(new ToolchainDefinition(
+				"Linaro AArch64 big-endian bare-metal ELF",
 				"aarch64_be-none-elf-", "aarch64"));
 
 		// 9
@@ -209,13 +225,14 @@ public static int getSize() {
 				"aarch64-linux-gnu-", "aarch64"));
 
 		// 10
-		ms_list.add(new ToolchainDefinition("Linaro AArch64 big-endian Linux GNU",
-				"aarch64_be-linux-gnu-", "aarch64"));
+		ms_list.add(new ToolchainDefinition(
+				"Linaro AArch64 big-endian Linux GNU", "aarch64_be-linux-gnu-",
+				"aarch64"));
 
 		// 11
-		tc = new ToolchainDefinition("test", "myPrefix");
-		tc.setTest();
-		ms_list.add(tc);
-		
+		// tc = new ToolchainDefinition("test", "myPrefix");
+		// tc.setTest();
+		// ms_list.add(tc);
+
 	}
 }
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainsManagedOptionValueHandler.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainsManagedOptionValueHandler.java
index bfb492b0c..f2ac56c13 100644
--- a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainsManagedOptionValueHandler.java
+++ b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/ToolchainsManagedOptionValueHandler.java
@@ -72,23 +72,26 @@ public boolean handleValue(IBuildObject configuration,
 
 	private void updateOptions(IHoldsOptions holder, IOption option) throws BuildException
 	{
-		String val;
-		val = option.getSelectedEnum();
+		String sId;
+		sId = option.getSelectedEnum();
 		// System.out.println("SelectedEnum="+val);
 
-		int pos = val.lastIndexOf(".");
-		String sToolchainIndex = val.substring(pos + 1);
+		int pos = sId.lastIndexOf(".");
+		int toolchainIndex = Integer.parseInt(sId.substring(pos + 1));
 		
-		System.out.println("ToolchainIndex="+sToolchainIndex);
+		System.out.println("ToolchainIndex="+toolchainIndex);
 
 		IConfiguration config = Utils.getConfiguration(holder);
-		Utils.updateOptions(config, sToolchainIndex);
+		Utils.updateOptions(config, toolchainIndex);
 
+		String sToolchainName = ToolchainDefinition.getToolchain(toolchainIndex).getName();
+		System.out.println("ToolchainName="+sToolchainName);
+		
 		IOption selOption;
 
 		// get the path from the shared storage
 		String pathKey = SetCrossCommandWizardPage.SHARED_CROSS_COMMAND_PATH
-				+ "." + sToolchainIndex;
+				+ "." + sToolchainName.hashCode();
 		String path = SharedDefaults.getInstance().getSharedDefaultsMap().get(pathKey);
 		if (path == null)
 			path = "";
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Utils.java b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Utils.java
index ef9378d90..4df6c7a10 100644
--- a/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Utils.java
+++ b/ilg.gnuarmeclipse.managedbuild.cross/src/ilg/gnuarmeclipse/managedbuild/cross/Utils.java
@@ -45,23 +45,23 @@ public static IConfiguration getConfiguration(IBuildObject configuration) {
 			return (IConfiguration) configuration;
 		return null;
 	}
-	
-	public static IConfiguration getConfiguration(IHoldsOptions holder){
+
+	public static IConfiguration getConfiguration(IHoldsOptions holder) {
 		if (holder instanceof IToolChain)
-			return ((IToolChain)holder).getParent();
+			return ((IToolChain) holder).getParent();
 		return null;
 	}
 
 	public static void updateOptions(IConfiguration config,
-			String sToolchainIndex) throws BuildException {
+			int toolchainIndex) throws BuildException {
 
 		IToolChain toolchain = config.getToolChain();
 
 		IOption option;
 		String val;
-		
+
 		ToolchainDefinition td = ToolchainDefinition
-				.getToolchain(sToolchainIndex);
+				.getToolchain(toolchainIndex);
 
 		option = toolchain.getOptionBySuperClassId(Activator.getOptionPrefix()
 				+ ".toolchain.name"); //$NON-NLS-1$
@@ -71,12 +71,6 @@ public static void updateOptions(IConfiguration config,
 		// values are not saved to .cproject.
 		config.setOption(toolchain, option, td.getName());
 
-		option = toolchain.getOptionBySuperClassId(Activator.getOptionPrefix()
-				+ ".family"); //$NON-NLS-1$
-		// compose the family ID
-		val = Activator.getOptionPrefix() + ".family." + td.getFamily();
-		config.setOption(toolchain, option, val);
-
 		option = toolchain.getOptionBySuperClassId(Activator.getOptionPrefix()
 				+ ".command.prefix"); //$NON-NLS-1$
 		config.setOption(toolchain, option, td.getPrefix());
@@ -117,5 +111,41 @@ public static void updateOptions(IConfiguration config,
 				+ ".command.rm"); //$NON-NLS-1$
 		config.setOption(toolchain, option, td.getCmdRm());
 
+		option = toolchain.getOptionBySuperClassId(Activator.getOptionPrefix()
+				+ ".family"); //$NON-NLS-1$
+		// compose the family ID
+		String sFamily = td.getFamily();
+		val = Activator.getOptionPrefix() + ".family." + sFamily;
+		config.setOption(toolchain, option, val);
+
+		if ("arm".equals(sFamily)) {
+			
+			option = toolchain.getOptionBySuperClassId(Activator
+					.getOptionPrefix() + ".base.arm.target.family");
+			config.setOption(toolchain, option, Activator.getOptionPrefix()
+					+ ".base.arm.mcpu.cortex-m3");
+
+			option = toolchain.getOptionBySuperClassId(Activator
+					.getOptionPrefix() + ".base.arm.target.instructionset");
+			config.setOption(toolchain, option, Activator.getOptionPrefix()
+					+ ".base.arm.target.instructionset.thumb");
+
+		} else if ("aarch64".equals(sFamily)) {
+			option = toolchain.getOptionBySuperClassId(Activator
+					.getOptionPrefix() + ".base.aarch64.target.family");
+			config.setOption(toolchain, option, Activator.getOptionPrefix()
+					+ ".base.aarch64.target.mcpu.generic");
+
+			option = toolchain.getOptionBySuperClassId(Activator
+					.getOptionPrefix() + ".base.aarch64.target.feature.simd");
+			config.setOption(toolchain, option, Activator.getOptionPrefix()
+					+ ".base.aarch64.target.cmodel.small");
+
+			option = toolchain.getOptionBySuperClassId(Activator
+					.getOptionPrefix() + ".base.aarch64.target.cmodel");
+			config.setOption(toolchain, option, Activator.getOptionPrefix()
+					+ ".base.aarch64.target.cmodel.small");
+
+		}
 	}
 }