Tweak gdb.trace/tfile.c for thumb mode

[deliverable/binutils-gdb.git] / gdb / f-valprint.c

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index b40b8fab6790060e38948c6a6df7abd895f5ab09..408c8cc622017ba227bc2e0385e0bfd003402ebc 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -1,7 +1,6 @@
 /* Support for printing Fortran values for GDB, the GNU debugger.
 
-   Copyright (C) 1993-1996, 1998-2000, 2003, 2005-2012 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993-2014 Free Software Foundation, Inc.
 
    Contributed by Motorola.  Adapted from the C definitions by Farooq Butt
    (fmbutt@engage.sps.mot.com), additionally worked over by Stan Shebs.
@@ -22,7 +21,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_string.h"
+#include <string.h>
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
@@ -412,7 +411,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
 }
 
 static void
-info_common_command_for_block (struct block *block, const char *comname,
+info_common_command_for_block (const struct block *block, const char *comname,
                               int *any_printed)
 {
   struct block_iterator iter;
@@ -425,10 +424,10 @@ info_common_command_for_block (struct block *block, const char *comname,
   ALL_BLOCK_SYMBOLS (block, iter, sym)
     if (SYMBOL_DOMAIN (sym) == COMMON_BLOCK_DOMAIN)
       {
-       struct common_block *common = SYMBOL_VALUE_COMMON_BLOCK (sym);
+       const struct common_block *common = SYMBOL_VALUE_COMMON_BLOCK (sym);
        size_t index;
 
-       gdb_assert (SYMBOL_CLASS (sym) == LOC_STATIC);
+       gdb_assert (SYMBOL_CLASS (sym) == LOC_COMMON_BLOCK);
 
        if (comname && (!SYMBOL_LINKAGE_NAME (sym)
                        || strcmp (comname, SYMBOL_LINKAGE_NAME (sym)) != 0))
@@ -473,7 +472,7 @@ static void
 info_common_command (char *comname, int from_tty)
 {
   struct frame_info *fi;
-  struct block *block;
+  const struct block *block;
   int values_printed = 0;
 
   /* We have been told to display the contents of F77 COMMON