diff options
| author | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-21 15:35:30 +0000 |
|---|---|---|
| committer | jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-08-21 15:35:30 +0000 |
| commit | d25dc80e2b6453982a01ef22602418db72c811d0 (patch) | |
| tree | 10f35f84224526e288df28bbabcc61007bedc751 /gcc/toplev.c | |
| parent | 7ddeac213899b72fc154495d3920abc7d3b94453 (diff) | |
| download | gcc-d25dc80e2b6453982a01ef22602418db72c811d0.tar.gz | |
gcc:
2007-08-21 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* configure.ac: Add --with-pkgversion and --with-bugurl.
* configure: Regenerate.
* doc/install.texi: Document them.
* version.c (version_string): Remove VERSUFFIX.
(VERSUFFIX): Remove.
(pkgversion_string): New.
(bug_report_url): Do not hard-code initializer.
* version.h (pkgversion_string): Declare.
* Makefile.in (PKGVERSION_s, BUGURL_s, PKGVERSION, BUGURL_TEXI):
Define.
(version.o): Define PKGVERSION and BUGURL.
(gcc-vers.texi): Define VERSION_PACKAGE and BUGURL.
(%.pod): Define BUGURL.
* gcc.c (process_command, main): Use pkgversion_string.
* toplev.c (compile_file, print_version): Likewise.
* protoize.c (main): Likewise.
* gcov.c (print_version): Likewise. Update copyright date.
* gcov-dump.c (print_version): Likewise. Update copyright date.
* mips-tdump.c (main): Likewise. Update copyright date.
* mips-tfile.c (main): Likewise. Update copyright date.
* doc/include/gcc-common.texi: Include VERSION_PACKAGE as subtitle.
* doc/bugreport.texi: Use BUGURL for bug-reporting instructions;
shorten description.
* doc/gcc.texi: Include VERSION_PACKAGE in version description.
* doc/gccint.texi: Likewise.
* doc/invoke.texi: Use BUGURL for bug-reporting instructions.
Update copyright date.
gcc/fortran:
2007-08-21 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* gfortranspec.c (lang_specific_driver): Use pkgversion_string.
* Make-lang.in (gfortran.pod): Define BUGURL.
* invoke.texi: Use BUGURL for bug-reporting instructions.
gcc/java:
2007-08-21 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* jcf-dump.c (version): Use pkgversion_string. Update copyright
date.
gcc/treelang:
2007-08-21 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* tree1.c (treelang_handle_option): Use pkgversion_string.
* treelang.texi (which-treelang): Define to use VERSION_PACKAGE.
maintainer-scripts:
2007-08-21 Paul Brook <paul@codesourcery.com>
Nathan Sidwell <nathan@codesourcery.com>
Mark Mitchell <mark@codesourcery.com>
Joseph Myers <joseph@codesourcery.com>
* gcc_release: Do not include copies of bugs.html in releases.
* update_web_docs_svn: Set VERSION_PACKAGE and BUGURL in
gcc-vers.texi.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127667 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/toplev.c')
| -rw-r--r-- | gcc/toplev.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gcc/toplev.c b/gcc/toplev.c index 440b4474e92..c138c178d51 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1105,8 +1105,14 @@ compile_file (void) string is patterned after the ones produced by native SVR4 compilers. */ #ifdef IDENT_ASM_OP if (!flag_no_ident) - fprintf (asm_out_file, "%s\"GCC: (GNU) %s\"\n", - IDENT_ASM_OP, version_string); + { + const char *pkg_version = "(GNU) "; + + if (strcmp ("(GCC) ", pkgversion_string)) + pkg_version = pkgversion_string; + fprintf (asm_out_file, "%s\"GCC: %s%s\"\n", + IDENT_ASM_OP, pkg_version, version_string); + } #endif /* This must be at the end. Some target ports emit end of file directives @@ -1174,9 +1180,9 @@ print_version (FILE *file, const char *indent) { static const char fmt1[] = #ifdef __GNUC__ - N_("%s%s%s version %s (%s)\n%s\tcompiled by GNU C version %s, ") + N_("%s%s%s %sversion %s (%s)\n%s\tcompiled by GNU C version %s, ") #else - N_("%s%s%s version %s (%s) compiled by CC, ") + N_("%s%s%s %sversion %s (%s) compiled by CC, ") #endif ; static const char fmt2[] = @@ -1191,7 +1197,7 @@ print_version (FILE *file, const char *indent) fprintf (file, file == stderr ? _(fmt1) : fmt1, indent, *indent != 0 ? " " : "", - lang_hooks.name, version_string, TARGET_NAME, + lang_hooks.name, pkgversion_string, version_string, TARGET_NAME, indent, __VERSION__); /* We need to stringify the GMP macro values. Ugh, gmp_version has |