diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-07 20:16:25 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-07 20:16:25 +0000 |
| commit | f280d70a0d905342f64209a374fb28d5ce127792 (patch) | |
| tree | 2ec4abec89652053f890da26b60bf7b63d1158b9 /libjava | |
| parent | 395b124c1571b138b05cf889d37624dcc15f2d16 (diff) | |
| download | gcc-f280d70a0d905342f64209a374fb28d5ce127792.tar.gz | |
gcc/java:
* gcj.texi (Invoking gcj-dbtool): Document '-f'.
libjava:
* gnu/gcj/tools/gcj_dbtool/Main.java (main): Recognize '-f'.
(usage): Document '-f'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96041 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/gcj/tools/gcj_dbtool/Main.java | 6 |
2 files changed, 9 insertions, 2 deletions
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" |