diff options
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-11-04 19:57:17 +0000 |
---|---|---|
committer | Ralf Wildenhues <rwild@gcc.gnu.org> | 2010-11-04 19:57:17 +0000 |
commit | df10a53597a1a0482b4d7db6c10ccb72a0ef6c00 (patch) | |
tree | 7ef810be688c1fe162cd63c184d61def4704042b /gcc | |
parent | 64cc2ce9cb3af2c8213dcb31c354e5ecc0c35acf (diff) | |
download | gcc-df10a53597a1a0482b4d7db6c10ccb72a0ef6c00.zip gcc-df10a53597a1a0482b4d7db6c10ccb72a0ef6c00.tar.gz gcc-df10a53597a1a0482b4d7db6c10ccb72a0ef6c00.tar.bz2 |
Fix PR driver/45703: let --help -v show linker help.
gcc/:
PR driver/45703
* collect2.c (main): Print --help output to stdout. Do not
exit right away, so ld --help is appended. Add empty lines
to separate output suitably.
From-SVN: r166327
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/collect2.c | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8c46368..daed3ba 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-11-04 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR driver/45703 + * collect2.c (main): Print --help output to stdout. Do not + exit right away, so ld --help is appended. Add empty lines + to separate output suitably. + 2010-11-04 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/46233 diff --git a/gcc/collect2.c b/gcc/collect2.c index a8cd232..465a98a 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -1698,16 +1698,16 @@ main (int argc, char **argv) if (helpflag) { - fprintf (stderr, "Usage: collect2 [options]\n"); - fprintf (stderr, " Wrap linker and generate constructor code if needed.\n"); - fprintf (stderr, " Options:\n"); - fprintf (stderr, " -debug Enable debug output\n"); - fprintf (stderr, " --help Display this information\n"); - fprintf (stderr, " -v, --version Display this program's version number\n"); - fprintf (stderr, "Overview: http://gcc.gnu.org/onlinedocs/gccint/Collect2.html\n"); - fprintf (stderr, "Report bugs: %s\n", bug_report_url); - - collect_exit (0); + printf ("Usage: collect2 [options]\n"); + printf (" Wrap linker and generate constructor code if needed.\n"); + printf (" Options:\n"); + printf (" -debug Enable debug output\n"); + printf (" --help Display this information\n"); + printf (" -v, --version Display this program's version number\n"); + printf ("\n"); + printf ("Overview: http://gcc.gnu.org/onlinedocs/gccint/Collect2.html\n"); + printf ("Report bugs: %s\n", bug_report_url); + printf ("\n"); } if (debug) |