libjava:

	* gnu/gcj/tools/gcj_dbtool/Main.java (main): Handle '-p'.
	(usage): Document '-p'.
	* Makefile.in: Rebuilt.
	* Makefile.am (dbexecdir): New variable.
	(db_name): Likewise.
	(dbexec_DATA): Likewise.
	($(db_name)): New target.
	(AM_CXXFLAGS): Define LIBGCJ_DEFAULT_DATABASE.
	* java/lang/natRuntime.cc (insertSystemProperties): Set default
	system database.
gcc/java:
	* gcj.texi (Invoking gcj-dbtool): Document 'gcj-dbtool -p'.
	(libgcj Runtime Properties): Document the default .db.


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

1 files changed, 11 insertions, 1 deletions

diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
index c918ad893f2..84b6f6dc369 100644
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
+++ b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
@@ -256,7 +256,16 @@ public class Main
 	  }	    
 	return;
       }
-    
+
+    if (s[0].equals("-p"))
+      {
+	insist (s.length == 1);
+	String result = System.getProperty("gnu.gcj.precompiled.db.path",
+					   "");
+	System.out.println (result);
+	return;
+      }
+
     usage(System.err);
     System.exit(1);	    
   }
@@ -284,6 +293,7 @@ public class Main
        + "    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"
+       + "    gcj-dbtool -p                       - Print default database name\n"
        + "             - Merge gcj map databases into dest\n"
        + "               Replaces dest\n"
        + "               To add to dest, include dest in the list of sources");