diff options
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/gcj.texi | 8 | ||||
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/gcj/tools/gcj_dbtool/Main.java | 6 |
4 files changed, 19 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 248627a6330..a03c6605091 100644 --- 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 b270b6fbbcf..227c230b9d7 100644 --- 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 f4729686af4..941ef2c1e73 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 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. (compileClass): Clone md5Digest instead of looking up a new one. diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java index ea8f35cf3f4..c918ad893f2 100644 --- 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" |