From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18694 invoked by alias); 12 Jul 2011 21:56:08 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 18661 invoked by uid 9674); 12 Jul 2011 21:56:07 -0000 Date: Tue, 12 Jul 2011 21:56:00 -0000 Message-ID: <20110712215607.18645.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-entryval: Merge remote-tracking branch 'gdb/master' into archer-jankratochvil-entryval X-Git-Refname: refs/heads/archer-jankratochvil-entryval X-Git-Reftype: branch X-Git-Oldrev: 54a00507e4d31533f64a6d4904a05ebe69c5b4a6 X-Git-Newrev: 6902ddff68c140462dd20623462d6e2b894059c7 X-SW-Source: 2011-q3/txt/msg00022.txt.bz2 List-Id: The branch, archer-jankratochvil-entryval has been updated via 6902ddff68c140462dd20623462d6e2b894059c7 (commit) via acfe85f56075910a3ba5e8b76189e0770079b8d1 (commit) via 1240d00ef2092028f3d3811ae4fb9295edaa7e30 (commit) via 5fa49ba4e80d342b0e2b7e7322947c7da45524e0 (commit) via b3c716393afae25cecbd588547b1d8efd6289433 (commit) via 06c711c6c945991bd95cdc8a4ce72b2c8ee80732 (commit) from 54a00507e4d31533f64a6d4904a05ebe69c5b4a6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 6902ddff68c140462dd20623462d6e2b894059c7 Merge: 54a0050 acfe85f Author: Jan Kratochvil Date: Tue Jul 12 23:55:09 2011 +0200 Merge remote-tracking branch 'gdb/master' into archer-jankratochvil-entryval Conflicts: gdb/value.c commit acfe85f56075910a3ba5e8b76189e0770079b8d1 Author: Jan Kratochvil Date: Tue Jul 12 21:16:46 2011 +0000 gdb/ Code cleanup making also optimized out values lazy. * dwarf2loc.c (dwarf2_evaluate_loc_desc_full): Use allocate_optimized_out_value. Twice. (loclist_read_variable) Use allocate_optimized_out_value. Once. * findvar.c (read_var_value): Likewise. * value.c (allocate_optimized_out_value): New function. * value.h (allocate_optimized_out_value): New declaration. commit 1240d00ef2092028f3d3811ae4fb9295edaa7e30 Author: Jan Kratochvil Date: Tue Jul 12 20:59:02 2011 +0000 gdb/ Fix occasional crash of CTRL-C during DWARF read in. * dwarf2read.c (dwarf2_mark_helper): Return on NULL CU. commit 5fa49ba4e80d342b0e2b7e7322947c7da45524e0 Author: Mike Frysinger Date: Tue Jul 12 20:21:27 2011 +0000 sim: include sim-options.h for command prototype The sim_args_command prototype is in sim-options.h, so pull it in directly rather than assuming a common header does it. Signed-off-by: Mike Frysinger commit b3c716393afae25cecbd588547b1d8efd6289433 Author: Mike Frysinger Date: Tue Jul 12 20:20:32 2011 +0000 sim: fix broken skel configure.ac example Shell code before AC_INIT will be silently culled, and since the common aclocal.m4 includes inline shell code, the file cannot be included before AC_INIT. So update the example to show people including the file after that rather than before to avoid random breakage. Signed-off-by: Mike Frysinger commit 06c711c6c945991bd95cdc8a4ce72b2c8ee80732 Author: Mike Frysinger Date: Tue Jul 12 20:19:49 2011 +0000 sim: use AC_REQUIRE with AC_PROG_CC The autoconf guys point out that our usage of AC_PROG_CC in the SIM_AC_COMMON does not jive with their intended use. http://www.gnu.org/software/autoconf/manual/autoconf.html#Expanded-Before-Required So utilize AC_REQUIRE to make the warnings go away and generate the correct code with different autoconf versions. Signed-off-by: Mike Frysinger ----------------------------------------------------------------------- Summary of changes: gdb/ChangeLog | 15 +++++++++++++++ gdb/dwarf2read.c | 7 +++++++ gdb/value.c | 5 +++-- sim/common/ChangeLog | 13 +++++++++++++ sim/common/aclocal.m4 | 4 ++-- sim/common/sim-command.c | 1 + 6 files changed, 41 insertions(+), 4 deletions(-) First 500 lines of diff: diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dffd058..8ed7eaf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,18 @@ +2011-07-12 Jan Kratochvil + + Code cleanup making also optimized out values lazy. + * dwarf2loc.c (dwarf2_evaluate_loc_desc_full): Use + allocate_optimized_out_value. Twice. + (loclist_read_variable) Use allocate_optimized_out_value. Once. + * findvar.c (read_var_value): Likewise. + * value.c (allocate_optimized_out_value): New function. + * value.h (allocate_optimized_out_value): New declaration. + +2011-07-12 Jan Kratochvil + + Fix occasional crash of CTRL-C during DWARF read in. + * dwarf2read.c (dwarf2_mark_helper): Return on NULL CU. + 2011-07-11 Tom Tromey * regcache.c (struct regcache_descr): Fix typo. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 71276e4..2b1e153 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -15722,6 +15722,13 @@ dwarf2_mark_helper (void **slot, void *data) struct dwarf2_per_cu_data *per_cu; per_cu = (struct dwarf2_per_cu_data *) *slot; + + /* cu->dependencies references may not yet have been ever read if QUIT aborts + reading of the chain. As such dependencies remain valid it is not much + useful to track and undo them during QUIT cleanups. */ + if (per_cu->cu == NULL) + return 1; + if (per_cu->cu->mark) return 1; per_cu->cu->mark = 1; diff --git a/gdb/value.c b/gdb/value.c index 6b77522..f308f3d 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -728,12 +728,13 @@ allocate_computed_value (struct type *type, return v; } +/* Allocate NOT_LVAL value for type TYPE being OPTIMIZED_OUT. */ + struct value * allocate_optimized_out_value (struct type *type) { - struct value *retval = allocate_value (type); + struct value *retval = allocate_value_lazy (type); - VALUE_LVAL (retval) = not_lval; set_value_optimized_out (retval, 1); return retval; diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index f4f8231..149a329 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,16 @@ +2011-07-12 Mike Frysinger + + * sim-command.c: Include sim-options.h. + +2011-07-12 Mike Frysinger + + * aclocal.m4: Move sinclude comment after AC_INIT comment. + +2011-07-12 Mike Frysinger + + * aclocal.m4 (SIM_AC_COMMON): Call AC_REQUIRE on AC_PROG_CC. + Delete direct call to AC_PROG_CC. + 2011-07-05 Mike Frysinger * sim-command.c: New file. diff --git a/sim/common/aclocal.m4 b/sim/common/aclocal.m4 index cec0155..5a34c21 100644 --- a/sim/common/aclocal.m4 +++ b/sim/common/aclocal.m4 @@ -8,9 +8,9 @@ # The simulator's configure.in should look like: # # dnl Process this file with autoconf to produce a configure script. -# sinclude(../common/aclocal.m4) # AC_PREREQ(2.5)dnl # AC_INIT(Makefile.in) +# sinclude(../common/aclocal.m4) # # SIM_AC_COMMON # @@ -24,11 +24,11 @@ sinclude([../../config/zlib.m4]) AC_DEFUN([SIM_AC_COMMON], [ +AC_REQUIRE([AC_PROG_CC]) # autoconf.info says this should be called right after AC_INIT. AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in) AC_CANONICAL_SYSTEM AC_ARG_PROGRAM -AC_PROG_CC AC_PROG_INSTALL # Put a plausible default for CC_FOR_BUILD in Makefile. diff --git a/sim/common/sim-command.c b/sim/common/sim-command.c index b6d0a19..a6d6b97 100644 --- a/sim/common/sim-command.c +++ b/sim/common/sim-command.c @@ -19,6 +19,7 @@ along with this program. If not, see . */ #include "sim-main.h" +#include "sim-options.h" #include "sim-utils.h" /* Generic implementation of sim_do_command that works with simulators hooks/post-receive -- Repository for Project Archer.