Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2019-09-03 10:27:38 -0400
committerJonah Graham2019-09-09 15:56:07 -0400
commit2cbf927a36d722adb50d0e90421378752ad15d43 (patch)
tree5bad2c2cadb431e1feacca4a1293db79daf5b738
parenta1febf009712cf7190b75519e8d610206e540009 (diff)
downloadorg.eclipse.cdt-2cbf927a36d722adb50d0e90421378752ad15d43.tar.gz
org.eclipse.cdt-2cbf927a36d722adb50d0e90421378752ad15d43.tar.xz
org.eclipse.cdt-2cbf927a36d722adb50d0e90421378752ad15d43.zip
Bug 550076 - Use PE64 parser by defaultCDT_9_9_0
-rw-r--r--build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml32
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java8
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml4
-rw-r--r--core/org.eclipse.cdt.ui/plugin.xml5
-rw-r--r--debug/org.eclipse.cdt.debug.application.doc/tasks/cdt_t_proj_parser.htm6
-rw-r--r--doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html2
-rw-r--r--doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm6
-rwxr-xr-xllvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF2
-rwxr-xr-xllvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml12
-rw-r--r--windows/org.eclipse.cdt.msw.build/plugin.xml2
-rw-r--r--windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java2
17 files changed, 49 insertions, 44 deletions
diff --git a/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF
index e9fd3792ee..7fe5b95686 100644
--- a/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.build.gcc.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GCC support for CDT Build Core
Bundle-SymbolicName: org.eclipse.cdt.build.gcc.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.100.qualifier
Bundle-Activator: org.eclipse.cdt.build.gcc.core.internal.Activator
Bundle-Vendor: Eclipse CDT
Require-Bundle: org.eclipse.core.runtime,
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
index 7e4a4de880..16fff2dd9b 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
@@ -226,7 +226,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
// TODO be smarter and use the id which should be the target
switch (Platform.getOS()) {
case Platform.OS_WIN32:
- return CCorePlugin.PLUGIN_ID + ".PE"; //$NON-NLS-1$
+ return CCorePlugin.PLUGIN_ID + ".PE64"; //$NON-NLS-1$
case Platform.OS_MACOSX:
return CCorePlugin.PLUGIN_ID + ".MachO64"; //$NON-NLS-1$
default:
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index 09bc3c2517..3d4ea53d48 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -54,7 +54,7 @@
defaultExtension="toor"
isAbstract="false"
makeCommand="make"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
makeArguments="-k"
osList="win32">
<tool
@@ -204,7 +204,7 @@
isTest="true"
defaultExtension="bus"
isAbstract="false"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
archList="x86,ppc"
parent="test.root"
makeArguments="-d"
@@ -374,7 +374,7 @@
isTest="true"
errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GmakeErrorParser"
name="Test Error Parsers"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
isAbstract="false"
id="test.error.parsers">
<tool
@@ -1225,7 +1225,7 @@
<targetPlatform
id="cdt.managedbuild.target.testgnu.platform.exe.debug"
name="Dbg Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -1298,7 +1298,7 @@
<targetPlatform
id="cdt.managedbuild.target.testgnu.platform.exe.release"
name="Rel Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -3646,7 +3646,7 @@
<targetPlatform
id="cdt.managedbuild.target.testenv.platform.exe.debug"
name="Dbg Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -3711,7 +3711,7 @@
<targetPlatform
id="cdt.managedbuild.target.testenv.platform.exe.release"
name="Rel Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -3819,7 +3819,7 @@
<targetPlatform
id="cdt.managedbuild.target.testenv.platform.exe.five"
name="Dbg Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -3873,7 +3873,7 @@
<targetPlatform
id="TopTC.platform"
name="TopTC Platform"
- binaryParser="org.eclipse.cdt.core.PE"/>
+ binaryParser="org.eclipse.cdt.core.PE64"/>
<builder
id="TopTC.managedbuilder"
name="TopTC Builder"/>
@@ -4018,7 +4018,7 @@
<targetPlatform
id="cdt.managedbuild.target.testMultipleVersions.platform.exe.debug"
name="Debug IA32 Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -4058,7 +4058,7 @@
<targetPlatform
id="cdt.managedbuild.target.testMultipleVersions.platform.exe.release"
name="Release IA32 Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -4159,7 +4159,7 @@
<targetPlatform
id="target.testProjectConverterConvenienceRoutines.platform.exe.debug"
name="Debug IA32 Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -4741,7 +4741,7 @@
<targetPlatform
id="cdt.test.fortran.platform.executable.release"
name="Platform.Executable.Release"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
osList="win32"
archList="x86">
</targetPlatform>
@@ -4785,7 +4785,7 @@
<targetPlatform
id="cdt.test.fortran.platform.executable.debug"
name="Platform.Executable.Debug"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
osList="win32"
archList="x86">
</targetPlatform>
@@ -5097,7 +5097,7 @@
<targetPlatform
id="cdt.managedbuild.target.enablement.platform.exe.debug"
name="Dbg Platform"
- binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.PE64"
osList="solaris,linux,hpux,aix,qnx"
archList="all">
</targetPlatform>
@@ -8470,7 +8470,7 @@
<targetPlatform
id="test.four.dot.zero.cdt.managedbuild.target.gnu.platform.cygwin.base"
name="Test 4.0 PlatformName.Dbg"
- binaryParser="org.eclipse.cdt.core.Cygwin_PE"
+ binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
osList="win32"
archList="all">
</targetPlatform>
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java
index 1bd037fb57..65b84a4c73 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests.java
@@ -80,7 +80,7 @@ public class ManagedBuildCoreTests extends TestCase {
int expectedSizeOSList = 5;
String[] expectedArchList = { "all" };
String expectedBinaryParser = "org.eclipse.cdt.core.ELF";
- String expectedBinaryParser2 = "org.eclipse.cdt.core.PE";
+ String expectedBinaryParser2 = "org.eclipse.cdt.core.PE64";
String[] expectedPlatformName = { "Dbg Platform", "Rel Platform" };
String expectedCommand = "make";
String expectedArguments = "-k";
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java
index 644bdbdcd3..70e2d55241 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java
@@ -891,7 +891,7 @@ public class ManagedBuildCoreTests20 extends TestCase {
private void checkRootProjectType(IProjectType type) throws BuildException {
// Project stuff
String expectedCleanCmd = "del /myworld";
- String expectedParserId = "org.eclipse.cdt.core.PE";
+ String expectedParserId = "org.eclipse.cdt.core.PE64";
String[] expectedOSList = { "win32" };
String[] expectedArchList = { "all" };
assertTrue(type.isTestProjectType());
@@ -1123,7 +1123,7 @@ public class ManagedBuildCoreTests20 extends TestCase {
*/
private void checkRootManagedProject(IManagedProject managedProj, String testValue) throws BuildException {
String expectedCleanCmd = "del /myworld";
- String expectedParserId = "org.eclipse.cdt.core.PE";
+ String expectedParserId = "org.eclipse.cdt.core.PE64";
String[] expectedOSList = { "win32" };
String[] expectedArchList = { "all" };
assertTrue(managedProj.getProjectType().isTestProjectType());
@@ -1571,7 +1571,7 @@ public class ManagedBuildCoreTests20 extends TestCase {
// Make sure the binary parser is hard-coded and available
IToolChain toolChain = configs[0].getToolChain();
ITargetPlatform targetPlatform = toolChain.getTargetPlatform();
- assertEquals("org.eclipse.cdt.core.PE", targetPlatform.getBinaryParserList()[0]);
+ assertEquals("org.eclipse.cdt.core.PE64", targetPlatform.getBinaryParserList()[0]);
String[] expectedOSList = { "win32", "linux", "solaris" };
assertTrue(Arrays.equals(expectedOSList, toolChain.getOSList()));
// Make sure the list is overridden
@@ -1880,7 +1880,7 @@ public class ManagedBuildCoreTests20 extends TestCase {
*/
private void checkErrorParsersProject(IManagedProject proj) throws BuildException {
// Target stuff
- String expectedBinParserId = "org.eclipse.cdt.core.PE";
+ String expectedBinParserId = "org.eclipse.cdt.core.PE64";
IConfiguration[] configs = proj.getConfigurations();
IToolChain toolChain = configs[0].getToolChain();
ITargetPlatform targetPlatform = toolChain.getTargetPlatform();
diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
index 49db430575..e433053bf6 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core; singleton:=true
-Bundle-Version: 8.7.100.qualifier
+Bundle-Version: 8.7.200.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd b/build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd
index f530f6c8ce..ae7409bbe1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd
+++ b/build/org.eclipse.cdt.managedbuilder.core/schema/ManagedBuildTools.exsd
@@ -514,7 +514,7 @@ Additional special types exist to flag options of special relevance to the build
<attribute name="binaryParser" type="string">
<annotation>
<documentation>
- Set this to the ID of the binary parser for the output format of your target. Currently there are only 2 choices: org.eclipse.cdt.core.ELF for *nix targets, and &quot;org.eclipse.cdt.core.PE&quot; for targets that build for Windows, like Cygwin.
+ Set this to the ID of the binary parser for the output format of your target. Currently there are only 2 choices: org.eclipse.cdt.core.ELF for *nix targets, and &quot;org.eclipse.cdt.core.PE64&quot; for targets that build for Windows, like Cygwin.
</documentation>
</annotation>
</attribute>
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
index 5a0ab9cc0e..632c4dad84 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.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.gnu.ui; singleton:=true
-Bundle-Version: 8.3.1.qualifier
+Bundle-Version: 8.3.100.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.gnu.ui.GnuUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 36eab81bf7..665913f5c7 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -1924,7 +1924,7 @@
<targetPlatform
id="cdt.managedbuild.target.gnu.platform.cygwin.base"
name="%PlatformName.Dbg"
- binaryParser="org.eclipse.cdt.core.Cygwin_PE"
+ binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
osList="win32"
archList="all">
</targetPlatform>
@@ -1994,7 +1994,7 @@
<targetPlatform
id="cdt.managedbuild.target.gnu.platform.mingw.base"
name="%PlatformName.Dbg"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
osList="win32"
archList="all">
</targetPlatform>
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 50e0430c72..ee0a5873c7 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -3344,6 +3344,11 @@
id="PEBinaryParserPage">
</parserPage>
<parserPage
+ class="org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage"
+ parserID="org.eclipse.cdt.core.Cygwin_PE64"
+ id="PEBinaryParserPage">
+ </parserPage>
+ <parserPage
class="org.eclipse.cdt.ui.dialogs.GNUXCoffBinaryParserPage"
parserID="org.eclipse.cdt.core.XCOFF32"
id="XcoffBinaryParserPage">
diff --git a/debug/org.eclipse.cdt.debug.application.doc/tasks/cdt_t_proj_parser.htm b/debug/org.eclipse.cdt.debug.application.doc/tasks/cdt_t_proj_parser.htm
index 7145c077d6..3591289af5 100644
--- a/debug/org.eclipse.cdt.debug.application.doc/tasks/cdt_t_proj_parser.htm
+++ b/debug/org.eclipse.cdt.debug.application.doc/tasks/cdt_t_proj_parser.htm
@@ -10,7 +10,7 @@
<div role="main"><h1>Selecting a binary parser</h1>
<p>Selecting the correct binary parser is important to ensure the
accuracy of the C/C++ Projects view and to successfully run and debug
-your programs. Windows users should select the PE Windows Parser. UNIX
+your programs. Windows users should select the PE64 Windows Parser. UNIX
and Linux users should select the Elf Parser. When you select the
correct parser for your development environment and build your project,
you can view the components of the .o file in the C/C++ Projects view
@@ -30,8 +30,8 @@ for binary parser are got from Preferences during project creation.</p>
<li>In the <strong>Binary Parser</strong> list, click:
<ul>
<li><strong>Elf Parser</strong>, if you are a Solaris, UNIX, or Linux user.</li>
- <li><strong>PE Windows Parser</strong>, if you are a Windows user.</li>
- <li><strong>Cygwin PE Parser</strong>, if you are using Cygwin.</li>
+ <li><strong>PE64 Windows Parser</strong>, if you are a Windows user.</li>
+ <li><strong>Cygwin PE64 Parser</strong>, if you are using Cygwin.</li>
</ul>
</li>
<li>Click <strong>OK</strong>.</li>
diff --git a/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html b/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html
index dc40567037..c256a2d68e 100644
--- a/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html
+++ b/doc/org.eclipse.cdt.doc.isv/guide/mbs/extensibilityGuide/Managed_Build_Extensibility.html
@@ -5043,7 +5043,7 @@ example.toolchain.targetplatform</code>.</li></a></a>
you will be using to create your example projects on. For example, if
you
are running this tutorial on Linux or Solaris, enter the value <code>org.eclipse.cdt.core.ELF</code>.
-If you are running the tutorial on Windows, enter the value <code>org.eclipse.cdt.core.PE</code>.</li>
+If you are running the tutorial on Windows, enter the value <code>org.eclipse.cdt.core.PE64</code>.</li>
</ol>
<p style="font-weight: normal;" class="subsection">
<strong>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
index 7145c077d6..3591289af5 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
@@ -10,7 +10,7 @@
<div role="main"><h1>Selecting a binary parser</h1>
<p>Selecting the correct binary parser is important to ensure the
accuracy of the C/C++ Projects view and to successfully run and debug
-your programs. Windows users should select the PE Windows Parser. UNIX
+your programs. Windows users should select the PE64 Windows Parser. UNIX
and Linux users should select the Elf Parser. When you select the
correct parser for your development environment and build your project,
you can view the components of the .o file in the C/C++ Projects view
@@ -30,8 +30,8 @@ for binary parser are got from Preferences during project creation.</p>
<li>In the <strong>Binary Parser</strong> list, click:
<ul>
<li><strong>Elf Parser</strong>, if you are a Solaris, UNIX, or Linux user.</li>
- <li><strong>PE Windows Parser</strong>, if you are a Windows user.</li>
- <li><strong>Cygwin PE Parser</strong>, if you are using Cygwin.</li>
+ <li><strong>PE64 Windows Parser</strong>, if you are a Windows user.</li>
+ <li><strong>Cygwin PE64 Parser</strong>, if you are using Cygwin.</li>
</ul>
</li>
<li>Click <strong>OK</strong>.</li>
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF
index 6082e6fa17..9d7271d153 100755
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/META-INF/MANIFEST.MF
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.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.llvm.ui;singleton:=true
-Bundle-Version: 1.1.8.qualifier
+Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.cdt.managedbuilder.llvm.ui.LlvmUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
index edcfd3bca9..396d33637f 100755
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
@@ -1222,7 +1222,7 @@
superClass="cdt.managedbuild.toolchain.llvm.clang.base">
<targetPlatform
archList="all"
- binaryParser="org.eclipse.cdt.core.Cygwin_PE"
+ binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
id="cdt.managedbuild.target.llvm.win32.cygwin.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
@@ -1241,7 +1241,7 @@
superClass="cdt.managedbuild.toolchain.llvm.clang.base">
<targetPlatform
archList="all"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
id="cdt.managedbuild.target.llvm.win32.mingw.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
@@ -1347,7 +1347,7 @@
superClass="cdt.managedbuild.toolchain.llvm.gnu.base">
<targetPlatform
archList="all"
- binaryParser="org.eclipse.cdt.core.Cygwin_PE"
+ binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
id="cdt.managedbuild.target.llvm.gnu.win32.cygwin.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
@@ -1366,7 +1366,7 @@
superClass="cdt.managedbuild.toolchain.llvm.gnu.base">
<targetPlatform
archList="all"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
id="cdt.managedbuild.target.llvm.gnu.win32.mingw.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
@@ -1432,7 +1432,7 @@
superClass="cdt.managedbuild.toolchain.llvm.with.static.compiler.base">
<targetPlatform
archList="all"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
id="cdt.managedbuild.target.llvm.static.compiler.win32.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
@@ -1498,7 +1498,7 @@
superClass="cdt.managedbuild.toolchain.llvm.jit.base">
<targetPlatform
archList="all"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
id="cdt.managedbuild.target.llvm.jit.win32.platform.base"
isAbstract="true"
name="%PlatformName.Dbg"
diff --git a/windows/org.eclipse.cdt.msw.build/plugin.xml b/windows/org.eclipse.cdt.msw.build/plugin.xml
index 4f77dc177c..1476eaa756 100644
--- a/windows/org.eclipse.cdt.msw.build/plugin.xml
+++ b/windows/org.eclipse.cdt.msw.build/plugin.xml
@@ -258,7 +258,7 @@
targetTool="org.eclipse.cdt.msvc.link;org.eclipse.cdt.msvc.lib">
<targetPlatform
archList="all"
- binaryParser="org.eclipse.cdt.core.PE"
+ binaryParser="org.eclipse.cdt.core.PE64"
id="org.eclipse.cdt.msvc.targetPlatform"
osList="win32">
</targetPlatform>
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java
index 94647a43ca..2297dec6e1 100644
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java
+++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/core/MSVCToolChain.java
@@ -206,7 +206,7 @@ public class MSVCToolChain extends PlatformObject implements IToolChain {
@Override
public String getBinaryParserId() {
- return CCorePlugin.PLUGIN_ID + ".PE"; //$NON-NLS-1$
+ return CCorePlugin.PLUGIN_ID + ".PE64"; //$NON-NLS-1$
}
@Override

Back to the top