Previously, the size of pointers was taken from the hosts pointer size. Now, it is...

[deliverable/binutils-gdb.git] / gdb / partial-stab.h

diff --git a/gdb/partial-stab.h b/gdb/partial-stab.h
index c51f091f1d45b711396d055dfc056611f979fee8..c494a07484d7b33a600f856de3b7fdf3e46bb43d 100644 (file)
--- a/gdb/partial-stab.h
+++ b/gdb/partial-stab.h
@@ -145,7 +145,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
        case N_UNDF:
 #ifdef DBXREAD_ONLY
-         if (processing_acc_compilation && bufp->n_strx == 1) {
+         if (processing_acc_compilation && CUR_SYMBOL_STRX == 1) {
            /* Deal with relative offsets in the string table
               used in ELF+STAB under Solaris.  If we want to use the
               n_strx field, which contains the name of the file,
@@ -154,7 +154,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
            past_first_source_file = 1;
            file_string_table_offset = next_file_string_table_offset;
            next_file_string_table_offset =
-             file_string_table_offset + bufp->n_value;
+             file_string_table_offset + CUR_SYMBOL_VALUE;
            if (next_file_string_table_offset < file_string_table_offset)
              error ("string table offset backs up at %d", symnum);
   /* FIXME -- replace error() with complaint.  */
@@ -290,6 +290,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
                    || psymtab_language != language_cplus))
              psymtab_language = tmp_language;
 
+           if (pst == NULL)
+             {
+               /* FIXME: we should not get here without a PST to work on.
+                  Attempt to recover.  */
+               complain (&unclaimed_bincl_complaint, namestring, symnum);
+               continue;
+             }
            add_bincl_to_list (pst, namestring, CUR_SYMBOL_VALUE);
 
            /* Mark down an include file in the current psymtab */
@@ -382,7 +389,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef DBXREAD_ONLY
          /* See if this is an end of function stab.  */
-         if (CUR_SYMBOL_TYPE == N_FUN && ! strcmp (namestring, ""))
+         if (CUR_SYMBOL_TYPE == N_FUN && *namestring == '\000')
            {
              unsigned long valu;
 
@@ -659,6 +666,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
            case '8':
            case '9':
            case '-':
+           case '#':   /* for symbol identification (used in live ranges) */
           /* added to support cfront stabs strings */
            case 'Z':   /* for definition continuations */
            case 'P':   /* for prototypes */