This patch add support for cpu marvell-whitney.

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

diff --git a/gdb/frame.c b/gdb/frame.c
index 8a2b8bf7e91f8ec7c373d0606a32edd0d7d66209..75ad34110d13cfde6577667068a9f26b44cd1db9 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -23,8 +23,6 @@
 #include "value.h"
 #include "inferior.h"  /* for inferior_ptid */
 #include "regcache.h"
-#include "gdb_assert.h"
-#include <string.h>
 #include "user-regs.h"
 #include "gdb_obstack.h"
 #include "dummy-frame.h"
@@ -38,7 +36,6 @@
 #include "gdbcmd.h"
 #include "observer.h"
 #include "objfiles.h"
-#include "exceptions.h"
 #include "gdbthread.h"
 #include "block.h"
 #include "inline-frame.h"
@@ -617,7 +614,7 @@ frame_id_eq (struct frame_id l, struct frame_id r)
        outer_frame_id.  */
     eq = 1;
   else if (l.stack_status == FID_STACK_INVALID
-          || l.stack_status == FID_STACK_INVALID)
+          || r.stack_status == FID_STACK_INVALID)
     /* Like a NaN, if either ID is invalid, the result is false.
        Note that a frame ID is invalid iff it is the null frame ID.  */
     eq = 0;
@@ -1603,13 +1600,13 @@ select_frame (struct frame_info *fi)
         block.  */
       if (get_frame_address_in_block_if_available (fi, &pc))
        {
-         struct symtab *s = find_pc_symtab (pc);
+         struct compunit_symtab *cust = find_pc_compunit_symtab (pc);
 
-         if (s
-             && s->language != current_language->la_language
-             && s->language != language_unknown
+         if (cust != NULL
+             && compunit_language (cust) != current_language->la_language
+             && compunit_language (cust) != language_unknown
              && language_mode == language_mode_auto)
-           set_language (s->language);
+           set_language (compunit_language (cust));
        }
     }
 }