X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdb-6.8-fortran-tag-constant.patch;h=3283984c4571305847ee06a06103dbeba82a63d6;hb=36d511ae8586f7fba145ee714a5f14fe1ea87377;hp=a7cc1ddfbc698ba411991d8aeacb29e4789c8c8e;hpb=7566401a0119655679c844fe8872a5daf36af173;p=packages%2Fgdb.git

diff --git a/gdb-6.8-fortran-tag-constant.patch b/gdb-6.8-fortran-tag-constant.patch
index a7cc1dd..3283984 100644
--- a/gdb-6.8-fortran-tag-constant.patch
+++ b/gdb-6.8-fortran-tag-constant.patch
@@ -1,8 +1,8 @@
-Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
+Index: gdb-7.1.90.20100711/gdb/dwarf2read.c
 ===================================================================
---- gdb-6.8.50.20090811.orig/gdb/dwarf2read.c	2009-08-13 10:14:45.000000000 +0200
-+++ gdb-6.8.50.20090811/gdb/dwarf2read.c	2009-08-13 10:22:36.000000000 +0200
-@@ -2480,6 +2480,7 @@ scan_partial_symbols (struct partial_die
+--- gdb-7.1.90.20100711.orig/gdb/dwarf2read.c	2010-07-12 23:07:35.000000000 +0200
++++ gdb-7.1.90.20100711/gdb/dwarf2read.c	2010-07-13 00:13:02.000000000 +0200
+@@ -2251,6 +2251,7 @@ scan_partial_symbols (struct partial_die
  	      add_partial_subprogram (pdi, lowpc, highpc, need_pc, cu);
  	      break;
  	    case DW_TAG_variable:
@@ -10,7 +10,7 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
  	    case DW_TAG_typedef:
  	    case DW_TAG_union_type:
  	      if (!pdi->is_declaration)
-@@ -2675,6 +2676,7 @@ add_partial_symbol (struct partial_die_i
+@@ -2452,6 +2453,7 @@ add_partial_symbol (struct partial_die_i
  	}
        break;
      case DW_TAG_variable:
@@ -18,15 +18,15 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
        if (pdi->is_external)
  	{
  	  /* Global Variable.
-@@ -2805,6 +2807,7 @@ die_needs_namespace (struct die_info *di
+@@ -3289,6 +3291,7 @@ die_needs_namespace (struct die_info *di
        return 1;
  
      case DW_TAG_variable:
 +    case DW_TAG_constant:
-       {
- 	struct attribute *attr;
- 	attr = dwarf2_attr (die, DW_AT_specification, cu);
-@@ -4741,7 +4744,8 @@ dwarf2_add_field (struct field_info *fip
+       /* We only need to prefix "globally" visible variables.  These include
+ 	 any variable marked with DW_AT_external or any variable that
+ 	 lives in a namespace.  [Variables in anonymous namespaces
+@@ -4638,7 +4641,8 @@ dwarf2_add_field (struct field_info *fip
  	  fip->non_public_fields = 1;
  	}
      }
@@ -36,7 +36,7 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
      {
        /* C++ static member.  */
  
-@@ -5233,7 +5237,8 @@ read_structure_type (struct die_info *di
+@@ -5250,7 +5254,8 @@ read_structure_type (struct die_info *di
        while (child_die && child_die->tag)
  	{
  	  if (child_die->tag == DW_TAG_member
@@ -46,7 +46,7 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
  	    {
  	      /* NOTE: carlton/2002-11-05: A C++ static data member
  		 should be a DW_TAG_member that is a declaration, but
-@@ -5352,6 +5357,7 @@ process_structure_scope (struct die_info
+@@ -5396,6 +5401,7 @@ process_structure_scope (struct die_info
      {
        if (child_die->tag == DW_TAG_member
  	  || child_die->tag == DW_TAG_variable
@@ -54,7 +54,7 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
  	  || child_die->tag == DW_TAG_inheritance)
  	{
  	  /* Do nothing.  */
-@@ -6980,6 +6986,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
+@@ -7109,6 +7115,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
  	  && abbrev->tag != DW_TAG_subprogram
  	  && abbrev->tag != DW_TAG_lexical_block
  	  && abbrev->tag != DW_TAG_variable
@@ -62,7 +62,7 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
  	  && abbrev->tag != DW_TAG_namespace
  	  && abbrev->tag != DW_TAG_module
  	  && abbrev->tag != DW_TAG_member)
-@@ -7088,6 +7095,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
+@@ -7217,6 +7224,7 @@ load_partial_dies (bfd *abfd, gdb_byte *
        if (load_all
  	  || abbrev->tag == DW_TAG_subprogram
  	  || abbrev->tag == DW_TAG_variable
@@ -70,7 +70,7 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
  	  || abbrev->tag == DW_TAG_namespace
  	  || part_die->is_declaration)
  	{
-@@ -8901,6 +8909,11 @@ new_symbol (struct die_info *die, struct
+@@ -9059,6 +9067,11 @@ new_symbol (struct die_info *die, struct
  	  /* Do not add the symbol to any lists.  It will be found via
  	     BLOCK_FUNCTION from the blockvector.  */
  	  break;
@@ -80,5 +80,5 @@ Index: gdb-6.8.50.20090811/gdb/dwarf2read.c
 +					    SYMBOL_TYPE (sym), NULL);
 +	  /* PASSTHRU */
  	case DW_TAG_variable:
+ 	case DW_TAG_member:
  	  /* Compilation with minimal debug info may result in variables
- 	     with missing type entries. Change the misleading `void' type