summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lindo2011-06-29 14:15:19 (EDT)
committerVivian Kong2011-06-29 14:15:19 (EDT)
commit674e4d5d396f0d2e043bd017894431253d5f14f3 (patch)
tree5e4c2ab68982c90a1b3479ca85d18012409f4643
parentb800932ebca27b2bda0922053d89164b532e3384 (diff)
downloadorg.eclipse.cdt-674e4d5d396f0d2e043bd017894431253d5f14f3.zip
org.eclipse.cdt-674e4d5d396f0d2e043bd017894431253d5f14f3.tar.gz
org.eclipse.cdt-674e4d5d396f0d2e043bd017894431253d5f14f3.tar.bz2
Bug 350501 - add support in managed build projects for xlC v11
compiler options Change-Id: I2281c37fc120ca788641bd7f4caae627927900cd
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF2
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties15
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml579
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/Messages.java3
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/messages.properties3
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/PreferenceConstants.java12
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/preferences/XLCompilerPreferencePage.java5
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/XLCompilerPropertyPage.java4
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/properties/applicability.properties19
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/src/org/eclipse/cdt/managedbuilder/xlc/ui/wizards/XLCSettingsWizardPage.java3
10 files changed, 621 insertions, 24 deletions
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 503a5a9..81bc979 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 2ca4f71..1fba317 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 542760a..9bf9b3e 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 @@
</enumeratedOptionValue>
</option>
<option
- defaultValue="false"
- name="%Option.enablevmx"
- category="xlc.c.compiler.category.output"
- command="-qenablevmx"
- id="xlc.c.compiler.option.output.enablevmx"
- valueType="boolean">
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.HiddenOptionApplicabilityCalculator"
+ category="xlc.c.compiler.category.output"
+ command="-qenablevmx"
+ defaultValue="false"
+ id="xlc.c.compiler.option.output.enablevmx"
+ name="%Option.enablevmx"
+ valueType="boolean">
</option>
<option
name="%Option.Enum"
@@ -1885,6 +1886,118 @@
name="POWER6 (TM) e">
</enumeratedOptionValue>
</option>
+ <option
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
+ category="xlc.c.compiler.category.optimization"
+ id="xlc.c.compiler.option.optimization.arch.11.1"
+ name="%Option.optimization.arch"
+ valueType="enumerated">
+ <enumeratedOptionValue
+ id="xlc.c.compiler.option.optimization.arch.default"
+ isDefault="true"
+ name="%Option.default">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=auto"
+ id="xlc.c.compiler.option.optimization.arch.auto"
+ name="auto">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=403"
+ id="xlc.c.compiler.option.optimization.arch.403"
+ name="PowerPC® 403">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=604"
+ id="xlc.c.compiler.option.optimization.arch.604"
+ name="PowerPC® 604">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr3"
+ id="xlc.c.compiler.option.optimization.arch.pwr3"
+ name="POWER3(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr4"
+ id="xlc.c.compiler.option.optimization.arch.pwr4"
+ name="POWER4(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr5"
+ id="xlc.c.compiler.option.optimization.arch.pwr5"
+ name="POWER5(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr5"
+ id="xlc.c.compiler.option.optimization.arch.pwr5"
+ name="POWER5(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc"
+ id="xlc.c.compiler.option.optimization.arch.ppc"
+ name="PowerPC®">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64"
+ id="xlc.c.compiler.option.optimization.arch.ppc64"
+ name="%Option.optimization.arch.ppc64">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppcgr"
+ id="xlc.c.compiler.option.optimization.arch.ppcgr"
+ name="%Option.optimization.arch.ppcgr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64gr"
+ id="xlc.c.compiler.option.optimization.arch.ppc64gr"
+ name="%Option.optimization.arch.ppc64gr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppcs4grsq"
+ id="xlc.c.compiler.option.optimization.arch.ppc64grsq"
+ name="%Option.optimization.arch.ppc64grsq">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64v"
+ id="xlc.c.compiler.option.optimization.arch.ppc64v"
+ name="%Option.optimization.arch.ppc64v">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc970"
+ id="xlc.c.compiler.option.optimization.arch.ppc970"
+ name="PowerPC® 970">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64a"
+ id="xlc.c.compiler.option.optimization.arch.rs64a"
+ name="RS64I">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64b"
+ id="xlc.c.compiler.option.optimization.arch.rs64b"
+ name="RS64II">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64c"
+ id="xlc.c.compiler.option.optimization.arch.rs64c"
+ name="RS64III">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr6"
+ id="xlc.c.compiler.option.optimization.arch.pwr6"
+ name="POWER6 (TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr6e"
+ id="xlc.c.compiler.option.optimization.arch.pwr6e"
+ name="POWER6 (TM) e">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr7"
+ id="xlc.c.compiler.option.optimization.arch.pwr7"
+ name="POWER7 (TM)">
+ </enumeratedOptionValue>
+ </option>
<option
applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
category="xlc.c.compiler.category.optimization"
@@ -2104,6 +2217,103 @@
name="RS64III">
</enumeratedOptionValue>
</option>
+ <option
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
+ category="xlc.c.compiler.category.optimization"
+ id="xlc.c.compiler.option.optimization.tune.11.1"
+ name="%Option.optimization.tune"
+ valueType="enumerated">
+ <enumeratedOptionValue
+ id="xlc.c.compiler.option.optimization.tune.default"
+ isDefault="true"
+ name="%Option.default">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=auto"
+ id="xlc.c.compiler.option.optimization.tune.auto"
+ name="%Option.optimization.tune.auto">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=403"
+ id="xlc.c.compiler.option.optimization.tune.403"
+ name="PowerPC® 403">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=604"
+ id="xlc.c.compiler.option.optimization.tune.604"
+ name="PowerPC® 604">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=pwr3"
+ id="xlc.c.compiler.option.optimization.tune.pwr3"
+ name="POWER3(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=pwr4"
+ id="xlc.c.compiler.option.optimization.tune.pwr4"
+ name="POWER4(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=pwr5"
+ id="xlc.c.compiler.option.optimization.tune.pwr5"
+ name="POWER5(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=pwr7"
+ id="xlc.c.compiler.option.optimization.tune.pwr7"
+ name="POWER7(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=ppc"
+ id="xlc.c.compiler.option.optimization.tune.ppc"
+ name="PowerPC®">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=ppc64"
+ id="xlc.c.compiler.option.optimization.tune.ppc64"
+ name="%Option.optimization.arch.ppc64">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=ppcgr"
+ id="xlc.c.compiler.option.optimization.tune.ppcgr"
+ name="%Option.optimization.arch.ppcgr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=ppc64gr"
+ id="xlc.c.compiler.option.optimization.tune.ppc64gr"
+ name="%Option.optimization.arch.ppc64gr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=ppcs4grsq"
+ id="xlc.c.compiler.option.optimization.tune.ppc64grsq"
+ name="%Option.optimization.arch.ppc64grsq">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=ppc64v"
+ id="xlc.c.compiler.option.optimization.tune.ppc64v"
+ name="%Option.optimization.arch.ppc64v">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=ppc970"
+ id="xlc.c.compiler.option.optimization.tune.ppc970"
+ name="PowerPC® 970">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=rs64a"
+ id="xlc.c.compiler.option.optimization.tune.rs64a"
+ name="RS64I">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=rs64b"
+ id="xlc.c.compiler.option.optimization.tune.rs64b"
+ name="RS64II">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qtune=rs64c"
+ id="xlc.c.compiler.option.optimization.tune.rs64c"
+ name="RS64III">
+ </enumeratedOptionValue>
+ </option>
<option
name="%Option.aggrcopy"
@@ -3017,6 +3227,363 @@
id="xlc.c.compiler.category.objcc"
name="%OptionCategory.objcc">
</optionCategory>
+ <option
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
+ category="xlc.c.compiler.category.optimization"
+ id="xlc.c.compiler.option.optimization.qassert"
+ name="%Option.optimization.qassert"
+ valueType="enumerated">
+ <enumeratedOptionValue
+ command="-qassert=norefalign"
+ id="xlc.c.compiler.option.optimization.qassert.norefalign"
+ isDefault="false"
+ name="%Option.optimization.qassert.norefalign">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qassert=refalign"
+ id="xlc.c.compiler.option.optimization.qassert.refalign"
+ isDefault="false"
+ name="%Option.optimization.qassert.refalign">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ id="xlc.c.compiler.option.optimization.qassert.defaut"
+ isDefault="false"
+ name="%Option.default">
+ </enumeratedOptionValue>
+ </option>
+ <option
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
+ category="xlc.c.compiler.category.ecd"
+ command="-qfunctrace"
+ id="xlc.c.compiler.option.qfunctrace"
+ name="%Option.qfunctrace"
+ valueType="boolean">
+ </option>
+ <option
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
+ category="xlc.c.compiler.category.optimization"
+ command="-qinline"
+ id="xlc.c.compiler.option.optimization.qinline"
+ name="%Option.optimization.inline"
+ valueType="string">
+ <enumeratedOptionValue
+ id="xlc.c.compiler.option.optimization.arch.default"
+ isDefault="true"
+ name="%Option.default">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=auto"
+ id="xlc.c.compiler.option.optimization.arch.auto"
+ name="auto">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=com"
+ id="xlc.c.compiler.option.optimization.arch.com"
+ name="com">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=403"
+ id="xlc.c.compiler.option.optimization.arch.403"
+ name="PowerPC® 403">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=601"
+ id="xlc.c.compiler.option.optimization.arch.601"
+ name="PowerPC® 601">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=602"
+ id="xlc.c.compiler.option.optimization.arch.602"
+ name="PowerPC® 602">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=603"
+ id="xlc.c.compiler.option.optimization.arch.603"
+ name="PowerPC® 603">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=604"
+ id="xlc.c.compiler.option.optimization.arch.604"
+ name="PowerPC® 604">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr"
+ id="xlc.c.compiler.option.optimization.arch.pwr"
+ name="POWER(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr2"
+ id="xlc.c.compiler.option.optimization.arch.pwr2"
+ name="POWER2(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr2s"
+ id="xlc.c.compiler.option.optimization.arch.pwr2s"
+ name="POWER2(TM) s">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr2sc"
+ id="xlc.c.compiler.option.optimization.arch.pwr2sc"
+ name="POWER2(TM) Super Chip">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr3"
+ id="xlc.c.compiler.option.optimization.arch.pwr3"
+ name="POWER3(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr4"
+ id="xlc.c.compiler.option.optimization.arch.pwr4"
+ name="POWER4(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr5"
+ id="xlc.c.compiler.option.optimization.arch.pwr5"
+ name="POWER5(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc"
+ id="xlc.c.compiler.option.optimization.arch.ppc"
+ name="PowerPC®">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64"
+ id="xlc.c.compiler.option.optimization.arch.ppc64"
+ name="%Option.optimization.arch.ppc64">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppcgr"
+ id="xlc.c.compiler.option.optimization.arch.ppcgr"
+ name="%Option.optimization.arch.ppcgr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64gr"
+ id="xlc.c.compiler.option.optimization.arch.ppc64gr"
+ name="%Option.optimization.arch.ppc64gr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppcs4grsq"
+ id="xlc.c.compiler.option.optimization.arch.ppc64grsq"
+ name="%Option.optimization.arch.ppc64grsq">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64v"
+ id="xlc.c.compiler.option.optimization.arch.ppc64v"
+ name="%Option.optimization.arch.ppc64v">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc970"
+ id="xlc.c.compiler.option.optimization.arch.ppc970"
+ name="PowerPC® 970">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64a"
+ id="xlc.c.compiler.option.optimization.arch.rs64a"
+ name="RS64I">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64b"
+ id="xlc.c.compiler.option.optimization.arch.rs64b"
+ name="RS64II">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64c"
+ id="xlc.c.compiler.option.optimization.arch.rs64c"
+ name="RS64III">
+ </enumeratedOptionValue>
+ </option>
+ <option
+ category="xlc.c.compiler.category.lm"
+ command="-qlistfmt"
+ id="xlc.c.compiler.option.lm.qlistfmt"
+ name="%Option.qlistfmt"
+ valueType="string">
+ <enumeratedOptionValue
+ id="xlc.c.lm.attr.none"
+ isDefault="false"
+ name="%Option.none">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qnoattr"
+ id="xlc.c.lm.attr.noattr"
+ isDefault="false"
+ name="%Option.attr.noattr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qattr=full"
+ id="xlc.c.lm.attr.fullattr"
+ isDefault="false"
+ name="%Option.attr.fullattr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qattr"
+ id="xlc.c.lm.attr.attr"
+ isDefault="false"
+ name="%Option.attr.attr">
+ </enumeratedOptionValue>
+ </option>
+ <option
+ category="xlc.c.compiler.category.optimization"
+ command="-qlibmpi"
+ defaultValue="false"
+ id="xlc.c.compiler.option.optimization.qlibmpi"
+ name="%Option.optimization.qlibmpi"
+ valueType="boolean">
+ </option>
+ <option
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
+ category="xlc.c.compiler.category.optimization"
+ command="-qsimd=auto"
+ id="xlc.c.compiler.option.optimization.qsimd"
+ name="%Option.optimization.qsimd"
+ valueType="boolean">
+ </option>
+ <option
+ category="xlc.c.compiler.category.lm"
+ command="-qskipsrc=hide"
+ id="xlc.c.compiler.option.lm.qskipsrc"
+ name="%Option.qskipsrc"
+ valueType="boolean">
+ </option>
+ <option
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
+ category="xlc.c.compiler.category.optimization"
+ id="xlc.c.compiler.option.optimization.qprefetch"
+ name="%Option.optimization.qprefetch"
+ valueType="string">
+ <enumeratedOptionValue
+ id="xlc.c.compiler.option.optimization.arch.default"
+ isDefault="true"
+ name="%Option.default">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=auto"
+ id="xlc.c.compiler.option.optimization.arch.auto"
+ name="auto">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=com"
+ id="xlc.c.compiler.option.optimization.arch.com"
+ name="com">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=403"
+ id="xlc.c.compiler.option.optimization.arch.403"
+ name="PowerPC® 403">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=601"
+ id="xlc.c.compiler.option.optimization.arch.601"
+ name="PowerPC® 601">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=602"
+ id="xlc.c.compiler.option.optimization.arch.602"
+ name="PowerPC® 602">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=603"
+ id="xlc.c.compiler.option.optimization.arch.603"
+ name="PowerPC® 603">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=604"
+ id="xlc.c.compiler.option.optimization.arch.604"
+ name="PowerPC® 604">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr"
+ id="xlc.c.compiler.option.optimization.arch.pwr"
+ name="POWER(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr2"
+ id="xlc.c.compiler.option.optimization.arch.pwr2"
+ name="POWER2(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr2s"
+ id="xlc.c.compiler.option.optimization.arch.pwr2s"
+ name="POWER2(TM) s">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr2sc"
+ id="xlc.c.compiler.option.optimization.arch.pwr2sc"
+ name="POWER2(TM) Super Chip">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr3"
+ id="xlc.c.compiler.option.optimization.arch.pwr3"
+ name="POWER3(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr4"
+ id="xlc.c.compiler.option.optimization.arch.pwr4"
+ name="POWER4(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=pwr5"
+ id="xlc.c.compiler.option.optimization.arch.pwr5"
+ name="POWER5(TM)">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc"
+ id="xlc.c.compiler.option.optimization.arch.ppc"
+ name="PowerPC®">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64"
+ id="xlc.c.compiler.option.optimization.arch.ppc64"
+ name="%Option.optimization.arch.ppc64">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppcgr"
+ id="xlc.c.compiler.option.optimization.arch.ppcgr"
+ name="%Option.optimization.arch.ppcgr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64gr"
+ id="xlc.c.compiler.option.optimization.arch.ppc64gr"
+ name="%Option.optimization.arch.ppc64gr">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppcs4grsq"
+ id="xlc.c.compiler.option.optimization.arch.ppc64grsq"
+ name="%Option.optimization.arch.ppc64grsq">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc64v"
+ id="xlc.c.compiler.option.optimization.arch.ppc64v"
+ name="%Option.optimization.arch.ppc64v">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=ppc970"
+ id="xlc.c.compiler.option.optimization.arch.ppc970"
+ name="PowerPC® 970">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64a"
+ id="xlc.c.compiler.option.optimization.arch.rs64a"
+ name="RS64I">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64b"
+ id="xlc.c.compiler.option.optimization.arch.rs64b"
+ name="RS64II">
+ </enumeratedOptionValue>
+ <enumeratedOptionValue
+ command="-qarch=rs64c"
+ id="xlc.c.compiler.option.optimization.arch.rs64c"
+ name="RS64III">
+ </enumeratedOptionValue>
+ </option>
+ <option
+ applicabilityCalculator="org.eclipse.cdt.managedbuilder.xlc.ui.properties.XLCApplicabilityCalculator"
+ category="xlc.c.compiler.category.objcc"
+ id="xlc.c.compiler.option.output.qstackprotect"
+ name="%Option.qstackprotect"
+ valueType="string">
+ </option>
</tool>
<tool
errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
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 05a8b62..aae1668 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 af1ec28..6d2ff89 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 551e32d..a3e977c 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 3635b43..80d53ec 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 a4fd1df..66d5b23 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 3f069a7..f3261ce 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 cfc4f7d..9692b45 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);