return zero in arm_linux_can_use_hw_breakpoint if HW point isn't supported

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

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index c7581a8928a671d27d72725f53074847fe496a00..8d74f03574c2147a5a98da9fa931cdd881f84cfa 100644 (file)
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -1,6 +1,6 @@
 /* Support for printing Fortran values for GDB, the GNU debugger.
 
-   Copyright (C) 1993-2014 Free Software Foundation, Inc.
+   Copyright (C) 1993-2015 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.
@@ -33,7 +33,6 @@
 #include "command.h"
 #include "block.h"
 #include "dictionary.h"
-#include "exceptions.h"
 
 extern void _initialize_f_valprint (void);
 static void info_common_command (char *, int);
@@ -349,7 +348,7 @@ f_val_print (struct type *type, const gdb_byte *valaddr, int embedded_offset,
          opts.format = (options->format ? options->format
                         : options->output_format);
          val_print_scalar_formatted (type, valaddr, embedded_offset,
-                                     original_value, options, 0, stream);
+                                     original_value, &opts, 0, stream);
        }
       else
        {
@@ -444,19 +443,22 @@ info_common_command_for_block (const struct block *block, const char *comname,
        for (index = 0; index < common->n_entries; index++)
          {
            struct value *val = NULL;
-           volatile struct gdb_exception except;
 
            printf_filtered ("%s = ",
                             SYMBOL_PRINT_NAME (common->contents[index]));
 
-           TRY_CATCH (except, RETURN_MASK_ERROR)
+           TRY
              {
                val = value_of_variable (common->contents[index], block);
                value_print (val, gdb_stdout, &opts);
              }
 
-           if (except.reason < 0)
-             printf_filtered ("<error reading variable: %s>", except.message);
+           CATCH (except, RETURN_MASK_ERROR)
+             {
+               printf_filtered ("<error reading variable: %s>", except.message);
+             }
+           END_CATCH
+
            putchar_filtered ('\n');
          }
       }
@@ -514,7 +516,4 @@ _initialize_f_valprint (void)
 {
   add_info ("common", info_common_command,
            _("Print out the values contained in a Fortran COMMON block."));
-  if (xdb_commands)
-    add_com ("lc", class_info, info_common_command,
-            _("Print out the values contained in a Fortran COMMON block."));
 }