* dwarf.c (display_gdb_index): Include static/global information

	of each symbol.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1ae2fc0..660d037 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-11  Doug Evans  <dje@google.com>
+
+       * dwarf.c (display_gdb_index): Include static/global information
+       of each symbol.
+

 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerate.
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
        * configure: Regenerate.

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 86d42a3..fa6860c 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -5793,9 +5793,11 @@ display_gdb_index (struct dwarf_section *section,
            printf ("\n");
          for (j = 0; j < num_cus; ++j)
            {
            printf ("\n");
          for (j = 0; j < num_cus; ++j)
            {

+             int is_static;

              gdb_index_symbol_kind kind;
 
              cu = byte_get_little_endian (constant_pool + cu_vector_offset + 4 + j * 4, 4);
              gdb_index_symbol_kind kind;
 
              cu = byte_get_little_endian (constant_pool + cu_vector_offset + 4 + j * 4, 4);

+             is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu);

              kind = GDB_INDEX_SYMBOL_KIND_VALUE (cu);
              cu = GDB_INDEX_CU_VALUE (cu);
              /* Convert to TU number if it's for a type unit.  */
              kind = GDB_INDEX_SYMBOL_KIND_VALUE (cu);
              cu = GDB_INDEX_CU_VALUE (cu);
              /* Convert to TU number if it's for a type unit.  */


@@ -5811,19 +5813,30 @@ display_gdb_index (struct dwarf_section *section,
                  printf (_(" [no symbol information]"));
                  break;
                case GDB_INDEX_SYMBOL_KIND_TYPE:
                  printf (_(" [no symbol information]"));
                  break;
                case GDB_INDEX_SYMBOL_KIND_TYPE:

-                 printf (_(" [type]"));
+                 printf (is_static
+                         ? _(" [static type]")
+                         : _(" [global type]"));

                  break;
                case GDB_INDEX_SYMBOL_KIND_VARIABLE:
                  break;
                case GDB_INDEX_SYMBOL_KIND_VARIABLE:

-                 printf (_(" [variable]"));
+                 printf (is_static
+                         ? _(" [static variable]")
+                         : _(" [global variable]"));

                  break;
                case GDB_INDEX_SYMBOL_KIND_FUNCTION:
                  break;
                case GDB_INDEX_SYMBOL_KIND_FUNCTION:

-                 printf (_(" [function]"));
+                 printf (is_static
+                         ? _(" [static function]")
+                         : _(" [global function]"));

                  break;
                case GDB_INDEX_SYMBOL_KIND_OTHER:
                  break;
                case GDB_INDEX_SYMBOL_KIND_OTHER:

-                 printf (_(" [other]"));
+                 printf (is_static
+                         ? _(" [static other]")
+                         : _(" [global other]"));

                  break;
                default:
                  break;
                default:

-                 printf (_(" [unknown: %d]"), kind);
+                 printf (is_static
+                         ? _(" [static unknown: %d]")
+                         : _(" [global unknown: %d]"),
+                         kind);

                  break;
                }
              if (num_cus > 1)
                  break;
                }
              if (num_cus > 1)