gcj.texi (Invoking gcj-dbtool): Document '-f'.

gcc/java:
	* gcj.texi (Invoking gcj-dbtool): Document '-f'.
libjava:
	* gnu/gcj/tools/gcj_dbtool/Main.java (main): Recognize '-f'.
	(usage): Document '-f'.

From-SVN: r96041

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 248627a633034541ad38fe5e7f65cffaed0d134e..a03c6605091adae3f71ec747d97732baa8b4a59a 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-07  Tom Tromey  <tromey@redhat.com>
+
+       * gcj.texi (Invoking gcj-dbtool): Document '-f'.
+
 2005-03-06  Kazu Hirata  <kazu@cs.umass.edu>
 
        * jcf-dump.c, jcf-io.c, jcf-reader.c, lang.c, parse.h,

diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index b270b6fbbcffab314a7639169cfcc3380b10e7aa..227c230b9d7ccc3e3a95d647f32b7aea076d64c8 100644 (file)
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -990,7 +990,8 @@ Each time a class is initialized, print a short message on standard error.
 @c man begin SYNOPSIS gcj-dbtool
 gcj-dbtool @option{OPTION} @var{DBFILE} [@option{MORE}] @dots{}
 
-gcj-dbtool [@option{-n}] [@option{-a}] [@option{-t}] [@option{-l}]
+gcj-dbtool [@option{-n}] [@option{-a}] [@option{-f}]
+  [@option{-t}] [@option{-l}]
   [@option{-v}] [@option{--version}] [@option{--help}]
 
 @c man end
@@ -1027,11 +1028,14 @@ you can choose a larger initial size if desired.  The default size is
 32,749.
 
 @item -a @var{DBFILE} @var{JARFILE} @var{LIB}
+@itemx -f @var{DBFILE} @var{JARFILE} @var{LIB}
 This adds a jar file to the database.  For each class file in the jar,
 a cryptographic signature of the bytecode representation of the class
 is recorded in the database.  At runtime, a class is looked up by its
 signature and the compiled form of the class is looked for in the
-corresponding shared library.
+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 -t @var{DBFILE}
 Test a database.

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f4729686af4f988e1c56100d89b6c8bd1ba48b7d..941ef2c1e737aa9eaeedc0b587c291145a1ef41a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-07  Tom Tromey  <tromey@redhat.com>
+
+       * gnu/gcj/tools/gcj_dbtool/Main.java (main): Recognize '-f'.
+       (usage): Document '-f'.
+
 2005-03-07  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/VMCompiler.java (md5Digest): New field.

diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
index ea8f35cf3f41cb247491c24609845abde3a70a53..c918ad893f20c048033b40dd05019affa77806d6 100644 (file)
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
+++ b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
@@ -75,7 +75,7 @@ public class Main
        return;
       }
 
-    if (s[0].equals("-a"))
+    if (s[0].equals("-a") || s[0].equals("-f"))
       {
        // Add a jar file to a database, creating it if necessary.
        // Copies the database, adds the jar file to the copy, and
@@ -94,7 +94,7 @@ public class Main
              map = PersistentByteMap.emptyPersistentByteMap(database, 
                                                             100, 100*32);
            File soFile = new File(s[3]);
-           if (! soFile.isFile())
+           if (! s[0].equals("-f") && ! soFile.isFile())
              throw new IllegalArgumentException(s[3] + " is not a file");
            map = addJar(jar, map, soFile);
          }
@@ -279,6 +279,8 @@ public class Main
        + "    gcj-dbtool -n file.gcjdb [size]     - Create a new gcj map database\n"
        + "    gcj-dbtool -a file.gcjdb file.jar file.so\n"
        + "            - Add the contents of file.jar to a new gcj map database\n"
+       + "    gcj-dbtool -f file.gcjdb file.jar file.so\n"
+       + "            - Add the contents of file.jar to a new gcj map database\n"
        + "    gcj-dbtool -t file.gcjdb            - Test a gcj map database\n"
        + "    gcj-dbtool -l file.gcjdb            - List a gcj map database\n"
        + "    gcj-dbtool -m dest.gcjdb [source.gcjdb]...\n"