gold won't build with gcc-9

[binutils-gdb.git] / gdb / disasm.c

diff --git a/gdb/disasm.c b/gdb/disasm.c
index 11793df67c0da2459f327f85c118aeaca3763065..128c3abfde4c6a2349b5d736a35f91c1ef8db6c5 100644 (file)
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -433,8 +433,8 @@ do_mixed_source_and_assembly_deprecated
                                                       "src_and_asm_line");
                      print_source_lines (symtab, next_line, next_line + 1,
                                          psl_flags);
-                     ui_out_emit_list inner_list_emitter (uiout,
-                                                          "line_asm_insn");
+                     ui_out_emit_list temp_list_emitter (uiout,
+                                                         "line_asm_insn");
                    }
                  /* Print the last line and leave list open for
                     asm instructions to be added.  */
@@ -660,7 +660,8 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch,
                   l < end_preceding_line_to_display;
                   ++l)
                {
-                 ui_out_emit_tuple tuple_emitter (uiout, "src_and_asm_line");
+                 ui_out_emit_tuple line_tuple_emitter (uiout,
+                                                       "src_and_asm_line");
                  print_source_lines (sal.symtab, l, l + 1, psl_flags);
                  ui_out_emit_list chain_line_emitter (uiout, "line_asm_insn");
                }
@@ -1008,19 +1009,24 @@ show_disassembler_options_sfunc (struct ui_file *file, int from_tty,
   if (options == NULL)
     options = "";
 
-  fprintf_filtered (file, _("The current disassembler options are '%s'\n"),
+  fprintf_filtered (file, _("The current disassembler options are '%s'\n\n"),
                    options);
 
   valid_options_and_args = gdbarch_valid_disassembler_options (gdbarch);
 
   if (valid_options_and_args == NULL)
-    return;
+    {
+      fputs_filtered (_("There are no disassembler options available "
+                       "for this architecture.\n"),
+                     file);
+      return;
+    }
 
   valid_options = &valid_options_and_args->options;
 
-  fprintf_filtered (file, _("\n\
+  fprintf_filtered (file, _("\
 The following disassembler options are supported for use with the\n\
-'set disassembler-options <option>[,<option>...]' command:\n"));
+'set disassembler-options OPTION [,OPTION]...' command:\n"));
 
   if (valid_options->description != NULL)
     {