Backport from mainline.

	2005-11-23  Mark Mitchell  <mark@codesourcery.com>
	* gcc/doc/invoke.texi: For man pages, include gcc-vers.texi.
	List @file in the option summary.  Include the libiberty documentation
	for @file.
	* gcc/gcc.c (main): Call expandargv.
	* gcc/Makefile.in (gcc-vers.texi): Define srcdir.

	2005-11-23  Mark Mitchell  <mark@codesourcery.com>
	* maintainer-scripts/update_web_docs_svn: Set @srcdir in gcc-vers.texi.



git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl/sourcerygxx-4_1@110032 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 25 insertions, 2 deletions

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 3756fefa1e8..1a264ab2a70 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,16 @@
+2006-01-20  Julian Brown  <julian@codesourcery.com>
+
+	Backport from mainline.
+	2005-11-23  Mark Mitchell  <mark@codesourcery.com>
+	* gcc/doc/invoke.texi: For man pages, include gcc-vers.texi.
+	List @file in the option summary.  Include the libiberty documentation
+	for @file.
+	* gcc/gcc.c (main): Call expandargv.
+	* gcc/Makefile.in (gcc-vers.texi): Define srcdir.
+
+	2005-11-23  Mark Mitchell  <mark@codesourcery.com>
+	* maintainer-scripts/update_web_docs_svn: Set @srcdir in gcc-vers.texi.
+
 2006-01-20  Paul Brook  <paul@codesourcery.com>
 
 	Merge from csl-arm-branch.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index a414d84e5d4..4c25ea18275 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3321,6 +3321,7 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE)
 	 then echo "@set DEVELOPMENT"; \
 	 else echo "@clear DEVELOPMENT"; \
 	 fi) > $@T
+	echo "@set srcdir $(srcdir)" >> $@T
 	mv -f $@T $@
 
 
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 84d8ead4874..4dc61521db7 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -4,6 +4,10 @@
 @c For copying conditions, see the file gcc.texi.
 
 @ignore
+@c man begin INCLUDE
+@include gcc-vers.texi
+@c man end
+
 @c man begin COPYRIGHT
 Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997,
 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -36,7 +40,7 @@ gcc [@option{-c}|@option{-S}|@option{-E}] [@option{-std=}@var{standard}]
     [@option{-I}@var{dir}@dots{}] [@option{-L}@var{dir}@dots{}]
     [@option{-D}@var{macro}[=@var{defn}]@dots{}] [@option{-U}@var{macro}]
     [@option{-f}@var{option}@dots{}] [@option{-m}@var{machine-option}@dots{}]
-    [@option{-o} @var{outfile}] @var{infile}@dots{}
+    [@option{-o} @var{outfile}] [@@@var{file}] @var{infile}@dots{}
 
 Only the most useful options are listed here; see below for the
 remainder.  @samp{g++} accepts mostly the same options as @samp{gcc}.
@@ -156,7 +160,7 @@ in the following sections.
 @item Overall Options
 @xref{Overall Options,,Options Controlling the Kind of Output}.
 @gccoptlist{-c  -S  -E  -o @var{file}  -combine -pipe  -pass-exit-codes  @gol
--x @var{language}  -v  -###  --help  --target-help  --version}
+-x @var{language}  -v  -###  --help  --target-help  --version @@@var{file}}
 
 @item C Language Options
 @xref{C Dialect Options,,Options Controlling C Dialect}.
@@ -1048,6 +1052,8 @@ line options for each tool.
 @item --version
 @opindex version
 Display the version number and copyrights of the invoked GCC@.
+
+@include @value{srcdir}/../libiberty/at-file.texi
 @end table
 
 @node Invoking G++
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 51f12706067..6f4b65b2e50 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -6032,6 +6032,8 @@ main (int argc, const char **argv)
 
   xmalloc_set_program_name (programname);
 
+  expandargv (&argc, &argv);
+
 #ifdef GCC_DRIVER_HOST_INITIALIZATION
   /* Perform host dependent initialization when needed.  */
   GCC_DRIVER_HOST_INITIALIZATION;
diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn
index ca9cc0f1122..de3c9cae6b3 100755
--- a/maintainer-scripts/update_web_docs_svn
+++ b/maintainer-scripts/update_web_docs_svn
@@ -140,6 +140,7 @@ fi
    else
       echo "@clear DEVELOPMENT"
    fi
+   echo "@set srcdir $WORKDIR/gcc/gcc"
 ) > $includedir/gcc-vers.texi
 
 # Now convert the relevant files from texi to HTML, PDF and PostScript.