Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 369594 | Differences between
and this patch

Collapse All | Expand All

(-)a/debug/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/RxThread.java (-6 / +10 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2000, 2010 QNX Software Systems and others.
2
 * Copyright (c) 2000, 2012 QNX Software Systems and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 9-14 Link Here
9
 *     QNX Software Systems - Initial API and implementation
9
 *     QNX Software Systems - Initial API and implementation
10
 *     Norbert Ploett, Siemens AG - fix for bug 119370
10
 *     Norbert Ploett, Siemens AG - fix for bug 119370
11
 *     Hewlett-Packard Development Company - fix for bug 109733 (null check in setPrompt)
11
 *     Hewlett-Packard Development Company - fix for bug 109733 (null check in setPrompt)
12
 *     Marc Khouzam (Ericsson) - Bug 369594: GDB 7.4 now reports solib events in MI, but no longer in CLI
12
 *******************************************************************************/
13
 *******************************************************************************/
13
package org.eclipse.cdt.debug.mi.core;
14
package org.eclipse.cdt.debug.mi.core;
14
15
Lines 306-312 Link Here
306
				}
307
				}
307
308
308
				// GDB does not provide reason when stopping on a shared library
309
				// GDB does not provide reason when stopping on a shared library
309
				// event or because of a catchpoint (in gdb < 7.0).
310
				// event  (gdb < 7.4) or because of a catchpoint (in gdb < 7.0).
310
				// Hopefully this will be fixed in a future version. Meanwhile,
311
				// Hopefully this will be fixed in a future version. Meanwhile,
311
				// we will use a hack to cope. On most platform we can detect by
312
				// we will use a hack to cope. On most platform we can detect by
312
				// looking at the console stream for phrase. Although it is a
313
				// looking at the console stream for phrase. Although it is a
Lines 427-439 Link Here
427
				}
428
				}
428
			}
429
			}
429
		}
430
		}
430
		// GDB does not have reason when stopping on shared, hopefully
431
		// GDB does not have reason when stopping on shared (gdb < 7.4)
431
		// this will be fix in newer version meanwhile, we will use a hack
432
		// we will use a hack
432
		// to cope.  On most platform we can detect this state by looking at the
433
		// to cope.  On most platform we can detect this state by looking at the
433
		// console stream for the phrase:
434
		// console stream for the phrase:
434
		// 	~"Stopped due to shared library event\n"
435
		// 	~"Stopped due to shared library event\n"
435
		//
436
		//
436
		// Althought it is a _real_ bad idea to do this, we do not have
437
		// Although it is a _real_ bad idea to do this, we do not have
437
		// any other alternatives.
438
		// any other alternatives.
438
		if (list.isEmpty()) {
439
		if (list.isEmpty()) {
439
			String[] logs = getStreamRecords();
440
			String[] logs = getStreamRecords();
Lines 533-539 Link Here
533
				event = new MIInferiorSignalExitEvent(session, rr);
534
				event = new MIInferiorSignalExitEvent(session, rr);
534
			}
535
			}
535
			session.getMIInferior().setTerminated(0,false);
536
			session.getMIInferior().setTerminated(0,false);
536
		} else if ("shlib-event".equals(reason)) { //$NON-NLS-1$
537
		} else if ("shlib-event".equals(reason) ||  //$NON-NLS-1$
538
				// GDB 7.4 reports this event as "solib-event"
539
				// Bug 369594
540
				   "solib-event".equals(reason)) {//$NON-NLS-1$
537
			if (exec != null) {
541
			if (exec != null) {
538
				event = new MISharedLibEvent(session, exec);
542
				event = new MISharedLibEvent(session, exec);
539
			} else if (rr != null) {
543
			} else if (rr != null) {

Return to bug 369594