natSystem.cc (SystemClass): New define.

	* java/lang/natSystem.cc (SystemClass): New define.
	(init_properties): Synchronize.

From-SVN: r26372

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e44147fc242fdc0b285cb3225701c4ebbae5e2e4..9025a3d1a1d06a0d1927de50c9d3bfe4388f662e 100644 (file)
--- 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 d47a7f8057ab0316045583da76e9a8a8b9e9b412..0d3993ecf24ebed29da174aaa204fdac9bc4c4ff 100644 (file)
--- 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 5f613d53eadb4bc6bd1dc96f883b552c5a8e80eb..6ceb642107495209f94126045c1e7970bb87ced1 100644 (file)
--- 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;
+
 \f
 
 #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 ce37a4ddef013e1fde225968e976d7ef24bf77d6..764c148a3cad4ad558a63d10dc34211600b962c2 100644 (file)
--- 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