(cr16c_elf_final_link_relocate): Remove duplicated return statements and

[deliverable/binutils-gdb.git] / gdb / mips-tdep.c

diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 44dadf389414db09fff5e1fa8064ac674ac64e23..c109ed28821c9a81da96d691d837ed0e10325e71 100644 (file)
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -761,9 +761,12 @@ mips_mask_address_p (struct gdbarch_tdep *tdep)
 }
 
 static void
-show_mask_address (char *cmd, int from_tty, struct cmd_list_element *c)
+show_mask_address (struct ui_file *file, int from_tty,
+                  struct cmd_list_element *c, const char *value)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+
+  deprecated_show_value_hack (file, from_tty, c, value);
   switch (mask_address_var)
     {
     case AUTO_BOOLEAN_TRUE:
@@ -5188,8 +5191,9 @@ This option can be set to one of:\n\
   auto  - Allow GDB to use the target's default setting or autodetect the\n\
           saved GP register size from information contained in the\n\
           executable (default)."),
+                       NULL,
                        NULL, /* FIXME: i18n: Size of general purpose registers saved on the stack is %s.  */
-                       NULL, NULL, &setmipscmdlist, &showmipscmdlist);
+                       &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to override the argument stack size. */
   add_setshow_enum_cmd ("stack-arg-size", class_obscure,
@@ -5201,20 +5205,26 @@ This option can be set to one of:\n\
   64    - Force GDB to allocate 64-bit chunks per argument\n\
   auto  - Allow GDB to determine the correct setting from the current\n\
           target and executable (default)"),
+                       NULL,
                        NULL, /* FIXME: i18n: The amount of stack space reserved for each argument is %s.  */
-                       NULL, NULL, &setmipscmdlist, &showmipscmdlist);
+                       &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to override the ABI. */
-  c = add_set_enum_cmd
-    ("abi", class_obscure, mips_abi_strings, &mips_abi_string,
-     "Set the ABI used by this program.\n"
-     "This option can be set to one of:\n"
-     "  auto  - the default ABI associated with the current binary\n"
-     "  o32\n"
-     "  o64\n" "  n32\n" "  n64\n" "  eabi32\n" "  eabi64", &setmipscmdlist);
-  set_cmd_sfunc (c, mips_abi_update);
-  add_cmd ("abi", class_obscure, show_mips_abi,
-          _("Show ABI in use by MIPS target"), &showmipscmdlist);
+  add_setshow_enum_cmd ("abi", class_obscure, mips_abi_strings,
+                       &mips_abi_string, _("\
+Set the MIPS ABI used by this program."), _("\
+Show the MIPS ABI used by this program."), _("\
+This option can be set to one of:\n\
+  auto  - the default ABI associated with the current binary\n\
+  o32\n\
+  o64\n\
+  n32\n\
+  n64\n\
+  eabi32\n\
+  eabi64"),
+                       mips_abi_update,
+                       show_mips_abi,
+                       &setmipscmdlist, &showmipscmdlist);
 
   /* Let the user turn off floating point and set the fence post for
      heuristic_proc_start.  */
@@ -5253,8 +5263,8 @@ Show the distance searched for the start of a function."), _("\
 If you are debugging a stripped executable, GDB needs to search through the\n\
 program for the start of a function.  This command sets the distance of the\n\
 search.  The only need to set it is when debugging a stripped executable."),
+                           reinit_frame_cache_sfunc,
                            NULL, /* FIXME: i18n: The distance searched for the start of a function is %s.  */
-                           reinit_frame_cache_sfunc, NULL,
                            &setlist, &showlist);
 
   /* Allow the user to control whether the upper bits of 64-bit
@@ -5265,8 +5275,8 @@ Set zeroing of upper 32 bits of 64-bit addresses."), _("\
 Show zeroing of upper 32 bits of 64-bit addresses."), _("\
 Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to \n\
 allow GDB to determine the correct value."),
-                               NULL, /* FIXME: i18n: Zerroing of upper 32 bits of 64-bit address is %s.  */
-                               NULL, show_mask_address, &setmipscmdlist, &showmipscmdlist);
+                               NULL, show_mask_address,
+                               &setmipscmdlist, &showmipscmdlist);
 
   /* Allow the user to control the size of 32 bit registers within the
      raw remote packet.  */
@@ -5279,8 +5289,8 @@ Show compatibility with 64-bit MIPS target that transfers 32-bit quantities."),
 Use \"on\" to enable backward compatibility with older MIPS 64 GDB+target\n\
 that would transfer 32 bits for some registers (e.g. SR, FSR) and\n\
 64 bits for others.  Use \"off\" to disable compatibility mode"),
+                          set_mips64_transfers_32bit_regs,
                           NULL, /* FIXME: i18n: Compatibility with 64-bit MIPS target that transfers 32-bit quantities is %s.  */
-                          set_mips64_transfers_32bit_regs, NULL,
                           &setlist, &showlist);
 
   /* Debug this files internals. */
@@ -5289,7 +5299,7 @@ that would transfer 32 bits for some registers (e.g. SR, FSR) and\n\
 Set mips debugging."), _("\
 Show mips debugging."), _("\
 When non-zero, mips specific debugging is enabled."),
+                           NULL,
                            NULL, /* FIXME: i18n: Mips debugging is currently %s.  */
-                           NULL, NULL,
                            &setdebuglist, &showdebuglist);
 }