diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
index 2017101759a..f299161fafd 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.debug.gdbjtag.core;singleton:=true
-Bundle-Version: 9.3.100.qualifier
+Bundle-Version: 9.4.0.qualifier
Bundle-Activator: org.eclipse.cdt.debug.gdbjtag.core.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
index 47099c2d51a..c25660b81da 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.properties
@@ -13,6 +13,7 @@
# IBM Corporation
# John Dallaway - migrate device extensions to core plugin, bug 538282
# John Dallaway - SEGGER J-Link extension, bug 548281
+# John Dallaway - PEmicro extension, bug 552597
###############################################################################
launchConfig.name=GDB Hardware Debugging
pluginName=Eclipse GDB Hardware Debug Core Plug-in
@@ -25,6 +26,7 @@ MacraigorUsb2Demon.name=Macraigor USB2Demon
GenericSerial.name=Generic Serial
OpenOCDPipe.name=OpenOCD (via pipe)
OpenOCDSocket.name=OpenOCD (via socket)
+PEMicro.name=PEmicro
SeggerJLink.name=SEGGER J-Link
Generic.name=Generic TCP/IP
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
index 7c9c4a61d2c..3c2e244bf7a 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/plugin.xml
@@ -57,6 +57,11 @@
id="org.eclipse.cdt.debug.gdbjtag.core.jtagdevice.OpenOCDSocket"
name="%OpenOCDSocket.name">
+
+
commands) {
+ /* not supported */
+ }
+
+ @Override
+ public void doHalt(Collection commands) {
+ /* not supported */
+ }
+
+ @Override
+ public void doReset(Collection commands) {
+ doResetAndHalt(commands);
+ doContinue(commands);
+ }
+
+ @Override
+ public void doResetAndHalt(Collection commands) {
+ addCmd(commands, "monitor reset"); //$NON-NLS-1$
+ }
+
+}