2005-04-07 Andrew Haley <aph@redhat.com>

        * gcj.texi: Correct gcj-dbtool instructions.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@97787 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 6d4d4bf..2a2b56a 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-07  Andrew Haley  <aph@redhat.com>
+
+       * gcj.texi: Correct gcj-dbtool instructions.
+
 2005-04-04  Kazu Hirata  <kazu@cs.umass.edu>
 
        * gcj.texi: Fix a typo.

diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index 523a0b5..c2e674e 100644 (file)
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -1009,9 +1009,9 @@ compatibility with existing application launch scripts:
 @c man begin SYNOPSIS gcj-dbtool
 gcj-dbtool @option{OPTION} @var{DBFILE} [@option{MORE}] @dots{}
 
-gcj-dbtool [@option{-n}] [@option{-a}] [@option{-f}]
+gcj-dbtool [@option{-0}] [@option{-}] [@option{-n}] [@option{-a}] [@option{-f}]
   [@option{-t}] [@option{-l}] [@option{-p} [@var{LIBDIR}]]
-  [@option{-v}] [@option{--version}] [@option{--help}]
+  [@option{-v}] [@option{-m}] [@option{--version}] [@option{--help}]
 
 @c man end
 @c man begin SEEALSO gij
@@ -1056,6 +1056,18 @@ corresponding shared library.  The @option{-a} option will verify
 that @var{LIB} exists before adding it to the database; @option{-f}
 skips this check.
 
+@item [@option{-}][@option{-0}] -m @var{DBFILE} @var{DBFILE},[@var{DBFILE}]
+Merge a number of databases.  The output database overwrites any
+existing database.  To add databases into an existing database,
+include the destination in the list of sources.
+
+If @option{-} or @option{-0} are used, the list of files to read is
+taken from standard input instead of the command line.  For
+@option{-0}, Input filenames are terminated by a null character
+instead of by whitespace.  Useful when arguments might contain white
+space.  The GNU find -print0 option produces input suitable for this
+mode.
+
 @item -t @var{DBFILE}
 Test a database.