OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[multiple changes]

Browse Source 
2003-08-08  Andrew Haley  <aph@redhat.com>

        * Makefile.am (AM_CXXFLAGS): Define BOOT_CLASS_PATH.
        * Makefile.in: Rebuild.
        * java/lang/natRuntime.cc (insertSystemProperties): Add
        "sun.boot.class.path".

2003-08-07  Andrew Haley  <aph@redhat.com>

        * java/io/PrintStream.java: Don't crash on a null string.

From-SVN: r70250
This commit is contained in:
Andrew Haley 2003-08-08 16:26:00 +00:00 committed by Andrew Haley
parent 258e7dbc94
commit fcbe85cdfe
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libjava/ChangeLog
View File

@ -1,3 +1,14 @@
2003-08-08 Andrew Haley <aph@redhat.com>
* Makefile.am (AM_CXXFLAGS): Define BOOT_CLASS_PATH.
* Makefile.in: Rebuild.
* java/lang/natRuntime.cc (insertSystemProperties): Add
"sun.boot.class.path".
2003-08-07 Andrew Haley <aph@redhat.com>
* java/io/PrintStream.java: Don't crash on a null string.
2003-08-07 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in: Don't initialize GCINCS to boehm-gc/include.

3
libjava/Makefile.am
View File

@ -101,7 +101,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
## Detect bugs in the verifier implementation, and maybe other places.
-Wswitch-enum \
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\""
-DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \
-DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\""
if USING_GCC
AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
else

3
libjava/Makefile.in
View File

@ -198,7 +198,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
-fdollars-in-identifiers \
-Wswitch-enum \
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
-DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\""
-DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \
-DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\""
@USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@

2
libjava/java/io/PrintStream.java
View File

@ -256,7 +256,7 @@ public class PrintStream extends FilterOutputStream
{
pw.print (str);
if (auto_flush)
if (str != null && auto_flush)
if ((str.indexOf ('\r') != -1)
|| (str.indexOf ('\n') != -1))
flush ();

5
libjava/java/lang/natRuntime.cc
View File

@ -564,7 +564,7 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
if (_Jv_Jar_Class_Path)
newprops->put(JvNewStringLatin1 ("java.class.path"),
JvNewStringLatin1 (_Jv_Jar_Class_Path));
JvNewStringLatin1 (_Jv_Jar_Class_Path));
else
{
// FIXME: find libgcj.zip and append its path?
@ -586,6 +586,9 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
sb->toString ());
}
// The path to libgcj's boot classes
SET ("sun.boot.class.path", BOOT_CLASS_PATH);
// The name used to invoke this process (argv[0] in C).
SET ("gnu.gcj.progname", _Jv_GetSafeArg (0));