aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/main.c9
2 files changed, 14 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e006943..e5008f6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2020-06-09 Jonny Grant <jg@jguk.org>
+2020-06-09 Simon Marchi <simon.marchi@polymtl.ca>
+
+ * main.c (captured_main_1): Don't print new line after help.
+ (print_gdb_help): add mailing list and IRC channel information
+ to --help. Add new lines between items in the footer. Remove
+ quotes around bug url.
+
2020-06-11 Keith Seitz <keiths@redhat.com>
PR gdb/21356
diff --git a/gdb/main.c b/gdb/main.c
index 59cb141..3649e4a 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1006,7 +1006,6 @@ captured_main_1 (struct captured_main_args *context)
if (print_help)
{
print_gdb_help (gdb_stdout);
- fputs_unfiltered ("\n", gdb_stdout);
exit (0);
}
@@ -1392,7 +1391,11 @@ For more information, type \"help\" from within GDB, or consult the\n\
GDB manual (available as on-line info or a printed manual).\n\
"), stream);
if (REPORT_BUGS_TO[0] && stream == gdb_stdout)
- fprintf_unfiltered (stream, _("\
-Report bugs to \"%s\".\n\
+ fprintf_unfiltered (stream, _("\n\
+Report bugs to %s.\n\
"), REPORT_BUGS_TO);
+ if (stream == gdb_stdout)
+ fprintf_unfiltered (stream, _("\n\
+You can ask GDB-related questions on the GDB users mailing list\n\
+(gdb@sourceware.org) or on GDB's IRC channel (#gdb on Freenode).\n"));
}