2009-03-02 23:14:15 +00:00
|
|
|
Index: gdb-6.8.50.20090228/gdb/dwarf2read.c
|
2008-12-14 14:05:20 +00:00
|
|
|
===================================================================
|
2009-03-02 23:14:15 +00:00
|
|
|
--- gdb-6.8.50.20090228.orig/gdb/dwarf2read.c 2009-03-02 01:07:36.000000000 +0100
|
|
|
|
+++ gdb-6.8.50.20090228/gdb/dwarf2read.c 2009-03-02 01:07:50.000000000 +0100
|
|
|
|
@@ -1996,6 +1996,7 @@ scan_partial_symbols (struct partial_die
|
2009-02-11 00:43:22 +00:00
|
|
|
add_partial_subprogram (pdi, lowpc, highpc, need_pc, cu);
|
2008-08-27 11:07:47 +00:00
|
|
|
break;
|
|
|
|
case DW_TAG_variable:
|
|
|
|
+ case DW_TAG_constant:
|
|
|
|
case DW_TAG_typedef:
|
|
|
|
case DW_TAG_union_type:
|
|
|
|
if (!pdi->is_declaration)
|
2009-03-02 23:14:15 +00:00
|
|
|
@@ -2211,6 +2212,7 @@ add_partial_symbol (struct partial_die_i
|
2008-08-27 11:07:47 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DW_TAG_variable:
|
|
|
|
+ case DW_TAG_constant:
|
|
|
|
if (pdi->is_external)
|
|
|
|
{
|
|
|
|
/* Global Variable.
|
2009-03-02 23:14:15 +00:00
|
|
|
@@ -4213,7 +4215,8 @@ dwarf2_add_field (struct field_info *fip
|
2008-08-27 11:07:47 +00:00
|
|
|
fip->non_public_fields = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
- else if (die->tag == DW_TAG_member || die->tag == DW_TAG_variable)
|
|
|
|
+ else if (die->tag == DW_TAG_member || die->tag == DW_TAG_variable
|
|
|
|
+ || die->tag == DW_TAG_constant)
|
|
|
|
{
|
|
|
|
/* C++ static member. */
|
|
|
|
|
2009-03-02 23:14:15 +00:00
|
|
|
@@ -4703,7 +4706,8 @@ read_structure_type (struct die_info *di
|
2008-08-27 11:07:47 +00:00
|
|
|
while (child_die && child_die->tag)
|
|
|
|
{
|
|
|
|
if (child_die->tag == DW_TAG_member
|
|
|
|
- || child_die->tag == DW_TAG_variable)
|
|
|
|
+ || child_die->tag == DW_TAG_variable
|
|
|
|
+ || child_die->tag == DW_TAG_constant)
|
|
|
|
{
|
|
|
|
/* NOTE: carlton/2002-11-05: A C++ static data member
|
|
|
|
should be a DW_TAG_member that is a declaration, but
|
2009-03-02 23:14:15 +00:00
|
|
|
@@ -4822,6 +4826,7 @@ process_structure_scope (struct die_info
|
2008-08-27 11:07:47 +00:00
|
|
|
{
|
|
|
|
if (child_die->tag == DW_TAG_member
|
|
|
|
|| child_die->tag == DW_TAG_variable
|
|
|
|
+ || child_die->tag == DW_TAG_constant
|
|
|
|
|| child_die->tag == DW_TAG_inheritance)
|
|
|
|
{
|
|
|
|
/* Do nothing. */
|
2009-03-02 23:14:15 +00:00
|
|
|
@@ -6455,6 +6460,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
|
2008-08-27 11:07:47 +00:00
|
|
|
&& abbrev->tag != DW_TAG_subprogram
|
2008-12-14 14:05:20 +00:00
|
|
|
&& abbrev->tag != DW_TAG_lexical_block
|
2008-08-27 11:07:47 +00:00
|
|
|
&& abbrev->tag != DW_TAG_variable
|
|
|
|
+ && abbrev->tag != DW_TAG_constant
|
|
|
|
&& abbrev->tag != DW_TAG_namespace
|
|
|
|
&& abbrev->tag != DW_TAG_member)
|
|
|
|
{
|
2009-03-02 23:14:15 +00:00
|
|
|
@@ -6562,6 +6568,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
|
2008-08-27 11:07:47 +00:00
|
|
|
if (load_all
|
|
|
|
|| abbrev->tag == DW_TAG_subprogram
|
|
|
|
|| abbrev->tag == DW_TAG_variable
|
|
|
|
+ || abbrev->tag == DW_TAG_constant
|
|
|
|
|| abbrev->tag == DW_TAG_namespace
|
|
|
|
|| part_die->is_declaration)
|
|
|
|
{
|
2009-03-02 23:14:15 +00:00
|
|
|
@@ -8341,6 +8348,11 @@ new_symbol (struct die_info *die, struct
|
2008-08-27 11:07:47 +00:00
|
|
|
/* Do not add the symbol to any lists. It will be found via
|
|
|
|
BLOCK_FUNCTION from the blockvector. */
|
|
|
|
break;
|
|
|
|
+ case DW_TAG_constant:
|
|
|
|
+ SYMBOL_TYPE (sym) = make_cv_type (1,
|
|
|
|
+ TYPE_VOLATILE (SYMBOL_TYPE (sym)),
|
|
|
|
+ SYMBOL_TYPE (sym), NULL);
|
|
|
|
+ /* PASSTHRU */
|
|
|
|
case DW_TAG_variable:
|
|
|
|
/* Compilation with minimal debug info may result in variables
|
|
|
|
with missing type entries. Change the misleading `void' type
|