Merge GDB 7.5.1

gdb/stack.c

 /* Print and select stack frames for GDB, the GNU debugger.
 
    Copyright (C) 1986-2005, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 41 matching lines @@
 #include "gdb_string.h"
 
 #include "psymtab.h"
 #include "symfile.h"
 
 void (*deprecated_selected_frame_level_changed_hook) (int);
 
 /* The possible choices of "set print frame-arguments", and the value
    of this setting.  */
 
-static const char *print_frame_arguments_choices[] =
+static const char *const print_frame_arguments_choices[] =
   {"all", "scalars", "none", NULL};
 static const char *print_frame_arguments = "scalars";
 
 /* The possible choices of "set print entry-values", and the value
    of this setting.  */
 
 const char print_entry_values_no[] = "no";
 const char print_entry_values_only[] = "only";
 const char print_entry_values_preferred[] = "preferred";
 const char print_entry_values_if_needed[] = "if-needed";
 const char print_entry_values_both[] = "both";
 const char print_entry_values_compact[] = "compact";
 const char print_entry_values_default[] = "default";
-static const char *print_entry_values_choices[] =
+static const char *const print_entry_values_choices[] =
 {
   print_entry_values_no,
   print_entry_values_only,
   print_entry_values_preferred,
   print_entry_values_if_needed,
   print_entry_values_both,
   print_entry_values_compact,
   print_entry_values_default,
   NULL
 };
@@ skipping 113 matching lines @@
 }
 
 /* Print single argument of inferior function.  ARG must be already
    read in.
 
    Errors are printed as if they would be the parameter value.  Use zeroed ARG
    iff it should not be printed accoring to user settings.  */
 
 static void
 print_frame_arg (const struct frame_arg *arg)