git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

From libjava... 

2005-03-24  Anthony Green  <green@redhat.com>

        * gnu/gcj/tools/gcj_dbtool/Main.java: Accept libdir argument with
        -p option.
        (usage): Add [LIBDIR] to help output.
        * gnu/gcj/tools/gcj_dbtool/natMain.cc: New file.
        * Makefile.am (AM_CXXFLAGS): Define
        LIBGCJ_DEFAULT_DATABASE_PATH_TAIL.
        (db_pathtail): New macro.

From gcc/java...

2005-03-24  Anthony Green  <green@redhat.com>

        * gcj.texi (Invoking gcj-dbtool): Document new LIBDIR option to
        'gcj-dbtool -p'.

From-SVN: r97028
This commit is contained in:
Anthony Green 2005-03-25 00:38:43 +00:00 committed by Anthony Green
parent 761d80b91f
commit 206318ea45
6 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/java/ChangeLog
View File

@ -1,3 +1,8 @@
2005-03-24 Anthony Green <green@redhat.com>
* gcj.texi (Invoking gcj-dbtool): Document new LIBDIR option to
'gcj-dbtool -p'.
2005-03-23 Tom Tromey <tromey@redhat.com> 2005-03-23 Tom Tromey <tromey@redhat.com>
* decl.c (GCJ_CURRENT_BC_ABI_VERSION): New define. * decl.c (GCJ_CURRENT_BC_ABI_VERSION): New define.

6
gcc/java/gcj.texi
View File

@ -991,7 +991,7 @@ Each time a class is initialized, print a short message on standard error.
gcj-dbtool @option{OPTION} @var{DBFILE} [@option{MORE}] @dots{} gcj-dbtool @option{OPTION} @var{DBFILE} [@option{MORE}] @dots{}
gcj-dbtool [@option{-n}] [@option{-a}] [@option{-f}] gcj-dbtool [@option{-n}] [@option{-a}] [@option{-f}]
[@option{-t}] [@option{-l}] [@option{-p}] [@option{-t}] [@option{-l}] [@option{-p} [@var{LIBDIR}]]
[@option{-v}] [@option{--version}] [@option{--help}] [@option{-v}] [@option{--version}] [@option{--help}]
@c man end @c man end
@ -1045,7 +1045,9 @@ List the contents of a database.
@item -p @item -p
Print the name of the default database. If there is no default Print the name of the default database. If there is no default
database, this prints a blank line. database, this prints a blank line. If @var{LIBDIR} is specified, use
it instead of the default library directory component of the database
name.
@item --help @item --help
Print a help message, then exit. Print a help message, then exit.

10
libjava/ChangeLog
View File

@ -1,3 +1,13 @@
2005-03-24 Anthony Green <green@redhat.com>
* gnu/gcj/tools/gcj_dbtool/Main.java: Accept libdir argument with
-p option.
(usage): Add [LIBDIR] to help output.
* gnu/gcj/tools/gcj_dbtool/natMain.cc: New file.
* Makefile.am (AM_CXXFLAGS): Define
LIBGCJ_DEFAULT_DATABASE_PATH_TAIL.
(db_pathtail): New macro.
2005-03-24 Tom Tromey <tromey@redhat.com> 2005-03-24 Tom Tromey <tromey@redhat.com>
* gnu/gcj/runtime/BootClassLoader.java (BootClassLoader): Don't * gnu/gcj/runtime/BootClassLoader.java (BootClassLoader): Don't

8
libjava/Makefile.am
View File

@ -130,6 +130,8 @@ propdir = $(libdir)
dbexecdir = $(libdir)/gcj-$(gcc_version) dbexecdir = $(libdir)/gcj-$(gcc_version)
## Name of the default .db. ## Name of the default .db.
db_name = classmap.db db_name = classmap.db
## Compiler specific component of the .db file
db_pathtail = gcj-@gcc_version@/$(db_name)
## For now, only on native systems. FIXME. ## For now, only on native systems. FIXME.
if NATIVE if NATIVE
@ -185,6 +187,7 @@ AM_CXXFLAGS = \
-DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \ -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
-DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \ -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
-DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
AM_GCJFLAGS = \ AM_GCJFLAGS = \
@ -715,7 +718,7 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
gnu/java/nio/PipeImpl$$SourceChannelImpl.h \ gnu/java/nio/PipeImpl$$SourceChannelImpl.h \
$(PLATFORM_INNER_NAT_HDRS) $(PLATFORM_INNER_NAT_HDRS)
nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) gnu/gcj/tools/gcj_dbtool/Main.h
nat_headers_install = $(ordinary_nat_headers) nat_headers_install = $(ordinary_nat_headers)
xlib_nat_headers = $(xlib_java_source_files:.java=.h) xlib_nat_headers = $(xlib_java_source_files:.java=.h)
@ -1028,7 +1031,8 @@ jv_convert_LDADD = -L$(here)/.libs libgcj.la
## linking this program. ## linking this program.
jv_convert_DEPENDENCIES = libgcj.la libgcj.spec jv_convert_DEPENDENCIES = libgcj.la libgcj.spec
gcj_dbtool_SOURCES = gnu/gcj/tools/gcj_dbtool/Main.java gcj_dbtool_SOURCES = gnu/gcj/tools/gcj_dbtool/Main.java \
gnu/gcj/tools/gcj_dbtool/natMain.cc
## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We
## need this because we are explicitly using libtool to link using the ## need this because we are explicitly using libtool to link using the
## `.la' file. ## `.la' file.

16
libjava/Makefile.in
View File

@ -4188,7 +4188,8 @@ libjawt_la_OBJECTS = $(am_libjawt_la_OBJECTS)
@GTK_AWT_TRUE@am_libjawt_la_rpath = -rpath $(toolexeclibdir) @GTK_AWT_TRUE@am_libjawt_la_rpath = -rpath $(toolexeclibdir)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT) am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT) \
gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS) gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS)
am__gen_from_JIS_SOURCES_DIST = gnu/gcj/convert/gen-from-JIS.c \ am__gen_from_JIS_SOURCES_DIST = gnu/gcj/convert/gen-from-JIS.c \
gnu/gcj/convert/make-trie.c gnu/gcj/convert/make-trie.c
@ -4544,6 +4545,7 @@ secdir = $(libdir)/security
propdir = $(libdir) propdir = $(libdir)
dbexecdir = $(libdir)/gcj-$(gcc_version) dbexecdir = $(libdir)/gcj-$(gcc_version)
db_name = classmap.db db_name = classmap.db
db_pathtail = gcj-@gcc_version@/$(db_name)
@NATIVE_TRUE@dbexec_DATA = $(db_name) @NATIVE_TRUE@dbexec_DATA = $(db_name)
bin_SCRIPTS = addr2name.awk bin_SCRIPTS = addr2name.awk
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
@ -4567,6 +4569,7 @@ AM_CXXFLAGS = \
-DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \ -DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
-DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \ -DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
-DTOOLEXECLIBDIR="\"$(toolexeclibdir)\"" -DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
AM_GCJFLAGS = \ AM_GCJFLAGS = \
@ -4813,7 +4816,7 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \
gnu/java/nio/PipeImpl$$SourceChannelImpl.h \ gnu/java/nio/PipeImpl$$SourceChannelImpl.h \
$(PLATFORM_INNER_NAT_HDRS) $(PLATFORM_INNER_NAT_HDRS)
nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) gnu/gcj/tools/gcj_dbtool/Main.h
nat_headers_install = $(ordinary_nat_headers) nat_headers_install = $(ordinary_nat_headers)
xlib_nat_headers = $(xlib_java_source_files:.java=.h) xlib_nat_headers = $(xlib_java_source_files:.java=.h)
extra_headers = java/lang/Object.h java/lang/Class.h extra_headers = java/lang/Object.h java/lang/Class.h
@ -4834,7 +4837,9 @@ jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
jv_convert_LINK = $(GCJLINK) jv_convert_LINK = $(GCJLINK)
jv_convert_LDADD = -L$(here)/.libs libgcj.la jv_convert_LDADD = -L$(here)/.libs libgcj.la
jv_convert_DEPENDENCIES = libgcj.la libgcj.spec jv_convert_DEPENDENCIES = libgcj.la libgcj.spec
gcj_dbtool_SOURCES = gnu/gcj/tools/gcj_dbtool/Main.java gcj_dbtool_SOURCES = gnu/gcj/tools/gcj_dbtool/Main.java \
gnu/gcj/tools/gcj_dbtool/natMain.cc
gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \ gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
@ -14672,6 +14677,9 @@ gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp):
gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT): \ gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT): \
gnu/gcj/tools/gcj_dbtool/$(am__dirstamp) \ gnu/gcj/tools/gcj_dbtool/$(am__dirstamp) \
gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp) gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT): \
gnu/gcj/tools/gcj_dbtool/$(am__dirstamp) \
gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/$(am__dirstamp)
gcj-dbtool$(EXEEXT): $(gcj_dbtool_OBJECTS) $(gcj_dbtool_DEPENDENCIES) gcj-dbtool$(EXEEXT): $(gcj_dbtool_OBJECTS) $(gcj_dbtool_DEPENDENCIES)
@rm -f gcj-dbtool$(EXEEXT) @rm -f gcj-dbtool$(EXEEXT)
$(gcj_dbtool_LINK) $(gcj_dbtool_LDFLAGS) $(gcj_dbtool_OBJECTS) $(gcj_dbtool_LDADD) $(LIBS) $(gcj_dbtool_LINK) $(gcj_dbtool_LDFLAGS) $(gcj_dbtool_OBJECTS) $(gcj_dbtool_LDADD) $(LIBS)
@ -14866,6 +14874,7 @@ mostlyclean-compile:
-rm -f gnu/gcj/runtime/natVMClassLoader.$(OBJEXT) -rm -f gnu/gcj/runtime/natVMClassLoader.$(OBJEXT)
-rm -f gnu/gcj/runtime/natVMClassLoader.lo -rm -f gnu/gcj/runtime/natVMClassLoader.lo
-rm -f gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT) -rm -f gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT)
-rm -f gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT)
-rm -f gnu/gcj/util/Debug.$(OBJEXT) -rm -f gnu/gcj/util/Debug.$(OBJEXT)
-rm -f gnu/gcj/util/Debug.lo -rm -f gnu/gcj/util/Debug.lo
-rm -f gnu/gcj/util/natDebug.$(OBJEXT) -rm -f gnu/gcj/util/natDebug.$(OBJEXT)
@ -19826,6 +19835,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natStringBuffer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natStringBuffer.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natVMClassLoader.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natVMClassLoader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/Main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/Main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/tools/gcj_dbtool/$(DEPDIR)/natMain.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/util/$(DEPDIR)/Debug.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/util/$(DEPDIR)/Debug.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/util/$(DEPDIR)/natDebug.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/util/$(DEPDIR)/natDebug.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/Clip.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/xlib/$(DEPDIR)/Clip.Plo@am__quote@

17
libjava/gnu/gcj/tools/gcj_dbtool/Main.java
View File

@ -259,9 +259,16 @@ public class Main
if (s[0].equals("-p")) if (s[0].equals("-p"))
{ {
insist (s.length == 1); insist (s.length == 1 || s.length == 2);
String result = System.getProperty("gnu.gcj.precompiled.db.path", String result;
"");
if (s.length == 1)
result = System.getProperty("gnu.gcj.precompiled.db.path", "");
else
result = (s[1]
+ (s[1].endsWith(File.separator) ? "" : File.separator)
+ getDbPathTail ());
System.out.println (result); System.out.println (result);
return; return;
} }
@ -270,6 +277,8 @@ public class Main
System.exit(1); System.exit(1);
} }
private static native String getDbPathTail ();
private static void insist(boolean ok) private static void insist(boolean ok)
{ {
if (! ok) if (! ok)
@ -296,7 +305,7 @@ public class Main
+ " - Merge gcj map databases into dest\n" + " - Merge gcj map databases into dest\n"
+ " Replaces dest\n" + " Replaces dest\n"
+ " To add to dest, include dest in the list of sources\n" + " To add to dest, include dest in the list of sources\n"
+ " gcj-dbtool -p - Print default database name"); + " gcj-dbtool -p [LIBDIR] - Print default database name");
} }
// Add a jar to a map. This copies the map first and returns a // Add a jar to a map. This copies the map first and returns a