- Rebase to FSF GDB 7.2.50.20110107 (which is a 7.3 pre-release).
- Import archer-tromey-python (BZ 666177, branch update by Phil Muldoon).
This commit is contained in:
parent
278e869a86
commit
33ff7091ac
11 changed files with 2354 additions and 324 deletions
|
|
@ -58,10 +58,10 @@ Http://sourceware.org/ml/gdb-patches/2010-01/msg00517.html
|
|||
* exec.c (exec_file_attach): Print a more useful error message if the
|
||||
user did "gdb core".
|
||||
|
||||
Index: gdb-7.2.50.20101231/gdb/exceptions.h
|
||||
Index: gdb-7.2.50.20110107/gdb/exceptions.h
|
||||
===================================================================
|
||||
--- gdb-7.2.50.20101231.orig/gdb/exceptions.h 2010-05-03 01:52:14.000000000 +0200
|
||||
+++ gdb-7.2.50.20101231/gdb/exceptions.h 2011-01-01 01:10:44.000000000 +0100
|
||||
--- gdb-7.2.50.20110107.orig/gdb/exceptions.h 2011-01-05 23:22:48.000000000 +0100
|
||||
+++ gdb-7.2.50.20110107/gdb/exceptions.h 2011-01-07 09:09:18.000000000 +0100
|
||||
@@ -78,6 +78,9 @@ enum errors {
|
||||
/* Feature is not supported in this copy of GDB. */
|
||||
UNSUPPORTED_ERROR,
|
||||
|
|
@ -72,10 +72,10 @@ Index: gdb-7.2.50.20101231/gdb/exceptions.h
|
|||
/* Add more errors here. */
|
||||
NR_ERRORS
|
||||
};
|
||||
Index: gdb-7.2.50.20101231/gdb/exec.c
|
||||
Index: gdb-7.2.50.20110107/gdb/exec.c
|
||||
===================================================================
|
||||
--- gdb-7.2.50.20101231.orig/gdb/exec.c 2010-08-31 20:08:43.000000000 +0200
|
||||
+++ gdb-7.2.50.20101231/gdb/exec.c 2011-01-01 01:10:44.000000000 +0100
|
||||
--- gdb-7.2.50.20110107.orig/gdb/exec.c 2011-01-05 23:22:48.000000000 +0100
|
||||
+++ gdb-7.2.50.20110107/gdb/exec.c 2011-01-07 09:09:18.000000000 +0100
|
||||
@@ -34,6 +34,7 @@
|
||||
#include "arch-utils.h"
|
||||
#include "gdbthread.h"
|
||||
|
|
@ -115,11 +115,11 @@ Index: gdb-7.2.50.20101231/gdb/exec.c
|
|||
}
|
||||
|
||||
/* FIXME - This should only be run for RS6000, but the ifdef is a poor
|
||||
Index: gdb-7.2.50.20101231/gdb/main.c
|
||||
Index: gdb-7.2.50.20110107/gdb/main.c
|
||||
===================================================================
|
||||
--- gdb-7.2.50.20101231.orig/gdb/main.c 2011-01-01 01:00:54.000000000 +0100
|
||||
+++ gdb-7.2.50.20101231/gdb/main.c 2011-01-01 01:11:48.000000000 +0100
|
||||
@@ -242,6 +242,36 @@ captured_command_loop (void *data)
|
||||
--- gdb-7.2.50.20110107.orig/gdb/main.c 2011-01-07 09:05:02.000000000 +0100
|
||||
+++ gdb-7.2.50.20110107/gdb/main.c 2011-01-07 09:10:14.000000000 +0100
|
||||
@@ -243,6 +243,36 @@ captured_command_loop (void *data)
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -156,7 +156,7 @@ Index: gdb-7.2.50.20101231/gdb/main.c
|
|||
static int
|
||||
captured_main (void *data)
|
||||
{
|
||||
@@ -688,6 +718,8 @@ captured_main (void *data)
|
||||
@@ -726,6 +756,8 @@ captured_main (void *data)
|
||||
{
|
||||
symarg = argv[optind];
|
||||
execarg = argv[optind];
|
||||
|
|
@ -165,7 +165,7 @@ Index: gdb-7.2.50.20101231/gdb/main.c
|
|||
optind++;
|
||||
}
|
||||
|
||||
@@ -828,10 +860,25 @@ Excess command line arguments ignored. (
|
||||
@@ -867,11 +899,25 @@ captured_main (void *data)
|
||||
&& symarg != NULL
|
||||
&& strcmp (execarg, symarg) == 0)
|
||||
{
|
||||
|
|
@ -184,12 +184,13 @@ Index: gdb-7.2.50.20101231/gdb/main.c
|
|||
/* The exec file and the symbol-file are the same. If we can't
|
||||
open it, better only print one error message.
|
||||
- catch_command_errors returns non-zero on success! */
|
||||
- if (catch_command_errors (exec_file_attach, execarg, !batch_flag, RETURN_MASK_ALL))
|
||||
- if (catch_command_errors (exec_file_attach, execarg,
|
||||
- !batch_flag, RETURN_MASK_ALL))
|
||||
+ catch_command_errors returns non-zero on success!
|
||||
+ Do not load EXECARG as a symbol file if it has been already processed
|
||||
+ as a core file. */
|
||||
+ if (catch_command_errors (func, execarg, !batch_flag, RETURN_MASK_ALL)
|
||||
+ && core_bfd == NULL)
|
||||
catch_command_errors (symbol_file_add_main, symarg, !batch_flag, RETURN_MASK_ALL);
|
||||
catch_command_errors (symbol_file_add_main, symarg,
|
||||
!batch_flag, RETURN_MASK_ALL);
|
||||
}
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue