diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF index 503a5a99acb..81bc979751f 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.xlc.ui; singleton := true -Bundle-Version: 6.1.0.qualifier +Bundle-Version: 6.3.0.qualifier Bundle-Activator: org.eclipse.cdt.managedbuilder.xlc.ui.XLCUIPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties index 2ca4f71a87b..1fba31745f5 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007, 2010 IBM Corporation and others. +# Copyright (c) 2007, 2011 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -63,7 +63,6 @@ OptionCategory.Assembler=Assembler Options OptionCategory.General=General OptionCategory.objcc=Object code control - # generic names used by multiple options Option.none = none Option.default = default @@ -201,8 +200,10 @@ Option.macros=Emit macro definitions to preprocessed output (-qshowmacros) Option.macros.all=all (-qshowmacros=all) Option.macros.pre=predefined (-qshowmacros=pre) Option.macros.nopre=no macros (-qshowmacros=nopre) +Option.qstackprotect = Protect against malicious code or programming errors that overwrite or corrupt the stack (-qstackprotect=) Options.timestamps=Suppress insert of implicit timestamps into an object file (-qnotimestamps) + # Optimization options Option.OptLevel = Optimization level Option.Optimize.Optimize = -O @@ -275,6 +276,12 @@ Option.optimization.strict_induction = Strict induction Option.optimization.nostrict_induction = No induction Option.optimization.tocdata = Mark data as local Option.optimization.w = Specify options to pass to specific compiler components (-W) +Option.optimization.qassert = Provides information about the characteristics of the files that can help to fine-tune optimizations (-qassert=) +Option.optimization.qassert.norefalign = norefalign +Option.optimization.qassert.refalign = refalign +Option.optimization.qlibmpi = Assert that functions with MPI names are in fact MPI functions (-qlibmpi) +Option.optimization.qsimd = Let the compiler automatically take advantage of vector instructions for processors that support them (-qsimd) +Option.optimization.qprefetch = Inserts prefetch instructions automatically where there are opportunities to improve code performance. (-qprefetch) # Linker Options Option.Linking.b = Control how shared objects are processed by the editor (-b) @@ -362,6 +369,7 @@ Option.attr.fullattr = Report attributes of all identifiers (-qattr=full) Option.attr.attr = Report attributes of only used identifiers (-qattr) Option.flag = Specify the minimum severity level of the diagnostic messages (-qflag=) Option.format = Warn of possible problems with string input and output format specifications (-qformat=) +Option.qskipsrc = Hide the source statements skipped by the compiler (-qskipsrc = hide) Option.halt = Instruct the compiler to stop after compilation if it encounters errors of specified severity or higher (-qhalt=) Option.halt.information = Information (-qhalt=i) Option.halt.warning = Warning (-qhalt=w) @@ -384,6 +392,7 @@ Option.xref.fullxref = Report all the identifiers in the program (-qxref = full) Option.xref.xref = Report only those identifiers which are used (-qxref) Option.warnfourcharconsts = Enable warning of four-character constants in source Option.report = Produce listing files that show how sections of code have been optimized (-qreport) +Option.qlistfmt = Creates a report to assist with finding optimization opportunities (-qlistfmt) # Error Checking and Debugging Option.g = Generate debugging information (-g) @@ -410,7 +419,7 @@ Option.initauto = Initialize the automatic variables (-qinitauto=) Option.linedebug = Generate line number and source file name info for the debugger (-qlinedebug) Option.maxerr = Halt compilation after this many errors (-qmaxerr=) Option.proto = All functions are prototyped (-qproto) - +Option.qfunctrace = Enable tracing for all functions in your program (-qfunctrace) # Assembler options Option.Xlc.Assembler.Flags=Other assembler flags diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml index 542760a05e3..9bf9b3ed318 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml @@ -1407,12 +1407,13 @@ + + + + + + + + + + ../../pom.xml - 6.1.0-SNAPSHOT + 6.3.0-SNAPSHOT org.eclipse.cdt.managedbuilder.xlc.ui eclipse-plugin diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/Messages.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/Messages.java index 05a8b621a76..aae1668e42f 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/Messages.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/Messages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2008 IBM Corporation and others. + * Copyright (c) 2007, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -18,6 +18,7 @@ public class Messages extends NLS { public static String XLCompiler_v8; public static String XLCompiler_v9; public static String XLCompiler_v10; + public static String XLCompiler_v11; public static String XLCompilerPreferencePage_0; public static String XLCompilerPreferencePage_1; public static String XLCompilerPreferencePage_2; diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/messages.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/messages.properties index af1ec281d67..6d2ff891ede 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/messages.properties +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/messages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007, 2010 IBM Corporation and others. +# Copyright (c) 2007, 2011 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ XLCompiler_v8=v8.0 XLCompiler_v9=v9.0 XLCompiler_v10=v10.1 +XLCompiler_v11=v11.1 XLCompilerPreferencePage_0=XL C/C++ Compiler Preferences XLCompilerPreferencePage_1=Compiler Root Path: XLCompilerPreferencePage_2=Compiler Version: diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/PreferenceConstants.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/PreferenceConstants.java index 551e32d96f3..a3e977c85d7 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/PreferenceConstants.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/PreferenceConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 IBM Corporation and others. + * Copyright (c) 2007, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -25,13 +25,17 @@ public class PreferenceConstants { public static final String P_XL_COMPILER_VERSION_8 = "v8.0"; //$NON-NLS-1$ public static final String P_XL_COMPILER_VERSION_9 = "v9.0"; //$NON-NLS-1$ public static final String P_XL_COMPILER_VERSION_10 = "v10.1"; //$NON-NLS-1$ + public static final String P_XL_COMPILER_VERSION_11 = "v11.1"; //$NON-NLS-1$ public static final String P_XL_COMPILER_VERSION_8_NAME = Messages.XLCompiler_v8; public static final String P_XL_COMPILER_VERSION_9_NAME = Messages.XLCompiler_v9; public static final String P_XL_COMPILER_VERSION_10_NAME = Messages.XLCompiler_v10; + public static final String P_XL_COMPILER_VERSION_11_NAME = Messages.XLCompiler_v11; public static String getVersion (String label) { - if (label.equalsIgnoreCase(P_XL_COMPILER_VERSION_10_NAME)) + if (label.equalsIgnoreCase(P_XL_COMPILER_VERSION_11_NAME)) + return P_XL_COMPILER_VERSION_11; + else if (label.equalsIgnoreCase(P_XL_COMPILER_VERSION_10_NAME)) return P_XL_COMPILER_VERSION_10; else if (label.equalsIgnoreCase(P_XL_COMPILER_VERSION_9_NAME)) return P_XL_COMPILER_VERSION_9; @@ -40,7 +44,9 @@ public class PreferenceConstants { } public static String getVersionLabel (String version) { - if (version.equalsIgnoreCase(P_XL_COMPILER_VERSION_10)) + if (version.equalsIgnoreCase(P_XL_COMPILER_VERSION_11)) + return P_XL_COMPILER_VERSION_11_NAME; + else if (version.equalsIgnoreCase(P_XL_COMPILER_VERSION_10)) return P_XL_COMPILER_VERSION_10_NAME; else if (version.equalsIgnoreCase(P_XL_COMPILER_VERSION_9)) return P_XL_COMPILER_VERSION_9_NAME; diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/XLCompilerPreferencePage.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/XLCompilerPreferencePage.java index 3635b4358de..80d53ec3737 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/XLCompilerPreferencePage.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/XLCompilerPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 IBM Corporation and others. + * Copyright (c) 2007, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -81,7 +81,8 @@ public class XLCompilerPreferencePage String[][] versionEntries = {{PreferenceConstants.P_XL_COMPILER_VERSION_8_NAME, PreferenceConstants.P_XL_COMPILER_VERSION_8}, {PreferenceConstants.P_XL_COMPILER_VERSION_9_NAME, PreferenceConstants.P_XL_COMPILER_VERSION_9}, - {PreferenceConstants.P_XL_COMPILER_VERSION_10_NAME, PreferenceConstants.P_XL_COMPILER_VERSION_10}}; + {PreferenceConstants.P_XL_COMPILER_VERSION_10_NAME, PreferenceConstants.P_XL_COMPILER_VERSION_10}, + {PreferenceConstants.P_XL_COMPILER_VERSION_11_NAME, PreferenceConstants.P_XL_COMPILER_VERSION_11}}; addField(new ComboFieldEditor(PreferenceConstants.P_XLC_COMPILER_VERSION, Messages.XLCompilerPreferencePage_2, versionEntries, getFieldEditorParent())); diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/XLCompilerPropertyPage.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/XLCompilerPropertyPage.java index a4fd1df292d..66d5b2365b4 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/XLCompilerPropertyPage.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/XLCompilerPropertyPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 IBM Corporation and others. + * Copyright (c) 2007, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -103,7 +103,7 @@ public class XLCompilerPropertyPage extends FieldEditorPreferencePage implements IProject project = ((IResource) (getElement().getAdapter(IResource.class))).getProject(); String[] versionEntries = { PreferenceConstants.P_XL_COMPILER_VERSION_8_NAME, - PreferenceConstants.P_XL_COMPILER_VERSION_9_NAME, PreferenceConstants.P_XL_COMPILER_VERSION_10_NAME }; + PreferenceConstants.P_XL_COMPILER_VERSION_9_NAME, PreferenceConstants.P_XL_COMPILER_VERSION_10_NAME, PreferenceConstants.P_XL_COMPILER_VERSION_11_NAME }; versionParent = getFieldEditorParent(); diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/applicability.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/applicability.properties index 3f069a71f03..f3261cedad9 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/applicability.properties +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/applicability.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2007, 2009 IBM Corporation and others. +# Copyright (c) 2007, 2011 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -9,12 +9,18 @@ # IBM Corporation - initial API and implementation ############################################################################### # START NON-TRANSLATABLE -xlc.applicability.version.order=v8.0,v9.0,v10.1 +xlc.applicability.version.order=v8.0,v9.0,v10.1,v11.1 xlc.c.compiler.option.optimization.arch=v8.0 -xlc.c.compiler.option.optimization.arch.9.0=v9.0+ +xlc.c.compiler.option.optimization.arch.9.0=v9.0,v10.1 +xlc.c.compiler.option.optimization.arch.11.1=v11.1+ +xlc.c.compiler.option.optimization.qassert=v11.1+ xlc.c.compiler.option.optimization.tune=v8.0 -xlc.c.compiler.option.optimization.tune.9.0=v9.0+ +xlc.c.compiler.option.optimization.tune.9.0=v9.0,v10.1 +xlc.c.compiler.option.optimization.tune.11.1=v11.1+ +xlc.c.compiler.option.optimization.qinline=v11.1+ +xlc.c.compiler.option.optimization.qsimd=v11.1+ +xlc.c.compiler.option.optimization.qprefetch=v11.1+ xlc.c.compiler.option.ifp.dfp=v9.0+ xlc.c.compiler.option.preprocessor.PreprocessRemoveComments=v9.0+ xlc.c.compiler.option.ecd.optdebug=v9.0+ @@ -29,4 +35,9 @@ xlc.c.compiler.option.cc.tls=v8.0,v9.0 xlc.c.compiler.option.cc.tls.v10=v10.1 xlc.c.compiler.option.output.macros=v10.1 xlc.c.compiler.option.output.timestamps=v10.1 +xlc.c.compiler.option.output.qstackprotect=v11.1+ +xlc.c.compiler.option.output.enablevmx=v8.0,v9.0,v10.1,v11.1 +xlc.c.compiler.option.qfunctrace=v11.1+ + + # END NON-TRANSLATABLE diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java index cfc4f7d06a0..9692b450bec 100644 --- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java +++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 IBM Corporation and others. + * Copyright (c) 2007, 2011 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -178,6 +178,7 @@ public class XLCSettingsWizardPage extends MBSCustomPage { fVersionCombo.add(PreferenceConstants.P_XL_COMPILER_VERSION_8_NAME); fVersionCombo.add(PreferenceConstants.P_XL_COMPILER_VERSION_9_NAME); fVersionCombo.add(PreferenceConstants.P_XL_COMPILER_VERSION_10_NAME); + fVersionCombo.add(PreferenceConstants.P_XL_COMPILER_VERSION_11_NAME); // set the default based on the workbench preference String compilerVersion = prefStore.getString(PreferenceConstants.P_XLC_COMPILER_VERSION);