diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 | ||||
| -rw-r--r-- | libjava/java/lang/natSystem.cc | 13 | ||||
| -rw-r--r-- | libjava/testsuite/Makefile.in | 6 |
4 files changed, 15 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e44147fc242..9025a3d1a1d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +1999-04-12 Tom Tromey <tromey@cygnus.com> + + * java/lang/natSystem.cc (SystemClass): New define. + (init_properties): Synchronize. + 1999-04-08 Geoff Berry <gcb@gnu.org> * natInetAddress.cc (lookup): Fix typo (AF_INET16 -> AF_INET6). diff --git a/libjava/Makefile.in b/libjava/Makefile.in index d47a7f8057a..0d3993ecf24 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -502,7 +502,6 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true - cygnus_hack = ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs @@ -1303,7 +1302,6 @@ distclean-multi: maintainer-clean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc index 5f613d53ead..6ceb6421074 100644 --- a/libjava/java/lang/natSystem.cc +++ b/libjava/java/lang/natSystem.cc @@ -45,6 +45,9 @@ details. */ #include <java/io/PrintStream.h> #include <java/io/InputStream.h> +#define SystemClass _CL_Q34java4lang6System +extern java::lang::Class SystemClass; + #if defined (ECOS) @@ -175,9 +178,13 @@ java::lang::System::identityHashCode (jobject obj) void java::lang::System::init_properties (void) { - if (prop_init) - return; - prop_init = true; + { + // We only need to synchronize around this gatekeeper. + JvSynchronize sync (&SystemClass); + if (prop_init) + return; + prop_init = true; + } properties = new java::util::Properties (); // A convenience define. diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index ce37a4ddef0..764c148a3ca 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -71,22 +71,17 @@ COMPPATH = @COMPPATH@ CPP = @CPP@ CXX = @CXX@ CXXCPP = @CXXCPP@ -DLLTOOL = @DLLTOOL@ EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@ EXEEXT = @EXEEXT@ GCDEPS = @GCDEPS@ GCINCS = @GCINCS@ GCLIBS = @GCLIBS@ GCOBJS = @GCOBJS@ -LD = @LD@ LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@ LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@ LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -NM = @NM@ PACKAGE = @PACKAGE@ PERL = @PERL@ RANLIB = @RANLIB@ @@ -234,7 +229,6 @@ clean-am: clean-generic mostlyclean-am clean: clean-am distclean-am: distclean-generic clean-am - -rm -f libtool distclean: distclean-am |
