diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/config/arm/embed.mt | 1 | ||||
| -rw-r--r-- | gdb/config/arm/linux.mt | 1 | ||||
| -rw-r--r-- | gdb/config/arm/tm-arm.h | 28 | ||||
| -rw-r--r-- | gdb/config/arm/wince.mt | 1 | ||||
| -rw-r--r-- | gdb/dbxread.c | 38 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/doc/gdbint.texinfo | 9 |
8 files changed, 20 insertions, 70 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5dbb4ea..d8599fe 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2007-10-11 Daniel Jacobowitz <dan@codesourcery.com> + + * dbxread.c (process_one_symbol): Remove VARIABLES_INSIDE_BLOCK + checks. + * config/arm/embed.mt, config/arm/linux.mt, config/arm/wince.mt: Do + not set DEPRECATED_TM_FILE. + * config/arm/tm-arm.h: Delete file. + 2007-10-11 Luis Machado <luisgpm@br.ibm.com> * MAINTAINERS (Write After Approval): Add self. diff --git a/gdb/config/arm/embed.mt b/gdb/config/arm/embed.mt index 1fe3524..4fe0147 100644 --- a/gdb/config/arm/embed.mt +++ b/gdb/config/arm/embed.mt @@ -1,6 +1,5 @@ # Target: ARM embedded system TDEPFILES= arm-tdep.o -DEPRECATED_TM_FILE= tm-arm.h SIM_OBS = remote-sim.o SIM = ../sim/arm/libsim.a diff --git a/gdb/config/arm/linux.mt b/gdb/config/arm/linux.mt index f2beeff..8f4a853 100644 --- a/gdb/config/arm/linux.mt +++ b/gdb/config/arm/linux.mt @@ -1,5 +1,4 @@ # Target: ARM based machine running GNU/Linux -DEPRECATED_TM_FILE= tm-arm.h TDEPFILES= arm-tdep.o arm-linux-tdep.o glibc-tdep.o solib.o \ solib-svr4.o solib-legacy.o symfile-mem.o \ corelow.o diff --git a/gdb/config/arm/tm-arm.h b/gdb/config/arm/tm-arm.h deleted file mode 100644 index 2419f93..0000000 --- a/gdb/config/arm/tm-arm.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Definitions to target GDB to ARM targets. - Copyright 1986, 1987, 1988, 1989, 1991, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2007 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef TM_ARM_H -#define TM_ARM_H - -/* Specify that for the native compiler variables for a particular - lexical context are listed after the beginning LBRAC instead of - before in the executables list of symbols. */ -#define VARIABLES_INSIDE_BLOCK(desc, gcc_p) (!(gcc_p)) - -#endif /* TM_ARM_H */ diff --git a/gdb/config/arm/wince.mt b/gdb/config/arm/wince.mt index b5c1cb7..0cf2c03 100644 --- a/gdb/config/arm/wince.mt +++ b/gdb/config/arm/wince.mt @@ -1,4 +1,3 @@ # Target: ARM based machine running Windows CE (win32) -DEPRECATED_TM_FILE= tm-arm.h TDEPFILES= arm-tdep.o arm-wince-tdep.o corelow.o \ solib.o solib-target.o diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 95f8cd8..d472d3e 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -2794,38 +2794,19 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, if (desc != new->depth) lbrac_mismatch_complaint (symnum); - /* Some compilers put the variable decls inside of an - LBRAC/RBRAC block. This macro should be nonzero if this is - true. DESC is N_DESC from the N_RBRAC symbol. GCC_P is true - if we've detected the GCC_COMPILED_SYMBOL or the - GCC2_COMPILED_SYMBOL. */ -#if !defined (VARIABLES_INSIDE_BLOCK) -#define VARIABLES_INSIDE_BLOCK(desc, gcc_p) 0 -#endif - - /* Can only use new->locals as local symbols here if we're in - GCC or on a machine that puts them before the lbrack. */ - if (!VARIABLES_INSIDE_BLOCK (desc, processing_gcc_compilation)) + if (local_symbols != NULL) { - if (local_symbols != NULL) - { - /* GCC development snapshots from March to December of - 2000 would output N_LSYM entries after N_LBRAC - entries. As a consequence, these symbols are simply - discarded. Complain if this is the case. Note that - there are some compilers which legitimately put local - symbols within an LBRAC/RBRAC block; this complaint - might also help sort out problems in which - VARIABLES_INSIDE_BLOCK is incorrectly defined. */ - complaint (&symfile_complaints, _("\ + /* GCC development snapshots from March to December of + 2000 would output N_LSYM entries after N_LBRAC + entries. As a consequence, these symbols are simply + discarded. Complain if this is the case. */ + complaint (&symfile_complaints, _("\ misplaced N_LBRAC entry; discarding local symbols which have \ no enclosing block")); - } - local_symbols = new->locals; } + local_symbols = new->locals; - if (context_stack_depth - > !VARIABLES_INSIDE_BLOCK (desc, processing_gcc_compilation)) + if (context_stack_depth > 1) { /* This is not the outermost LBRAC...RBRAC pair in the function, its local symbols preceded it, and are the ones @@ -2858,9 +2839,6 @@ no enclosing block")); within_function = 0; } - if (VARIABLES_INSIDE_BLOCK (desc, processing_gcc_compilation)) - /* Now pop locals of block just finished. */ - local_symbols = new->locals; break; case N_FN: diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index e7f03fd..7222c04 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,7 @@ +2007-10-11 Daniel Jacobowitz <dan@codesourcery.com> + + * gdbint.texinfo (Target Conditionals): Remove VARIABLES_INSIDE_BLOCK. + 2007-09-30 Daniel Jacobowitz <dan@codesourcery.com> * gdb.texinfo (Setting Watchpoints): Adjust warning text about diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index facea70..d8dbcb0 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -4178,15 +4178,6 @@ This method has been deprecated in favour of @code{gdbarch_return_value} Convert a value of type @var{type} into the raw contents of a register. @xref{Target Architecture Definition, , Using Different Register and Memory Data Representations}. -@item VARIABLES_INSIDE_BLOCK (@var{desc}, @var{gcc_p}) -@findex VARIABLES_INSIDE_BLOCK -For dbx-style debugging information, if the compiler puts variable -declarations inside LBRAC/RBRAC blocks, this should be defined to be -nonzero. @var{desc} is the value of @code{n_desc} from the -@code{N_RBRAC} symbol, and @var{gcc_p} is true if @value{GDBN} has noticed the -presence of either the @code{GCC_COMPILED_SYMBOL} or the -@code{GCC2_COMPILED_SYMBOL}. By default, this is 0. - @end table Motorola M68K target conditionals. |