2012-05-09 Frank Ch. Eigler <fche@redhat.com>

[deliverable/binutils-gdb.git] / gdb / mdebugread.c

diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index c95c09b62eddbb3cce54ccfb9d534e15c6ab5f64..a20f9533ba43e6a1a49cadfc0753d872042fbdbf 100644 (file)
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -1047,7 +1047,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
                if (tsym.st != stMember)
                  break;
 
-               SET_FIELD_BITPOS (*f, tsym.value);
+               SET_FIELD_ENUMVAL (*f, tsym.value);
                FIELD_TYPE (*f) = t;
                FIELD_NAME (*f) = debug_info->ss + cur_fdr->issBase + tsym.iss;
                FIELD_BITSIZE (*f) = 0;
@@ -2359,7 +2359,7 @@ parse_partial_symbols (struct objfile *objfile)
   int past_first_source_file = 0;
 
   /* List of current psymtab's include files.  */
-  char **psymtab_include_list;
+  const char **psymtab_include_list;
   int includes_allocated;
   int includes_used;
   EXTR *extern_tab;
@@ -2389,8 +2389,8 @@ parse_partial_symbols (struct objfile *objfile)
 
   includes_allocated = 30;
   includes_used = 0;
-  psymtab_include_list = (char **) alloca (includes_allocated *
-                                          sizeof (char *));
+  psymtab_include_list = (const char **) alloca (includes_allocated *
+                                                sizeof (const char *));
   next_symbol_text_func = mdebug_next_symbol_text;
 
   dependencies_allocated = 30;
@@ -2754,7 +2754,7 @@ parse_partial_symbols (struct objfile *objfile)
          for (cur_sdx = 2; cur_sdx < fh->csym; cur_sdx++)
            {
              int type_code;
-             char *namestring;
+             const char *namestring;
 
              (*swap_sym_in) (cur_bfd,
                              (((char *) debug_info->external_sym)
@@ -3090,13 +3090,13 @@ parse_partial_symbols (struct objfile *objfile)
                      psymtab_include_list[includes_used++] = namestring;
                      if (includes_used >= includes_allocated)
                        {
-                         char **orig = psymtab_include_list;
+                         const char **orig = psymtab_include_list;
 
-                         psymtab_include_list = (char **)
+                         psymtab_include_list = (const char **)
                            alloca ((includes_allocated *= 2) *
-                                   sizeof (char *));
+                                   sizeof (const char *));
                          memcpy (psymtab_include_list, orig,
-                                 includes_used * sizeof (char *));
+                                 includes_used * sizeof (const char *));
                        }
                      continue;
                    }
@@ -4713,7 +4713,7 @@ sort_blocks (struct symtab *s)
 {
   struct blockvector *bv = BLOCKVECTOR (s);
 
-  if (BLOCKVECTOR_NBLOCKS (bv) <= 2)
+  if (BLOCKVECTOR_NBLOCKS (bv) <= FIRST_LOCAL_BLOCK)
     {
       /* Cosmetic */
       if (BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK)) == 0)
@@ -4728,7 +4728,7 @@ sort_blocks (struct symtab *s)
    * are very different.  It would be nice to find a reliable test
    * to detect -O3 images in advance.
    */
-  if (BLOCKVECTOR_NBLOCKS (bv) > 3)
+  if (BLOCKVECTOR_NBLOCKS (bv) > FIRST_LOCAL_BLOCK + 1)
     qsort (&BLOCKVECTOR_BLOCK (bv, FIRST_LOCAL_BLOCK),
           BLOCKVECTOR_NBLOCKS (bv) - FIRST_LOCAL_BLOCK,
           sizeof (struct block *),