Merge GNU Classpath 0.99 into libjava.

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

1 files changed, 6 insertions, 15 deletions

diff --git a/libjava/classpath/vm/reference/java/lang/VMSystem.java b/libjava/classpath/vm/reference/java/lang/VMSystem.java
index 52a3c1c9f66..0b3d6920055 100644
--- a/libjava/classpath/vm/reference/java/lang/VMSystem.java
+++ b/libjava/classpath/vm/reference/java/lang/VMSystem.java
@@ -1,5 +1,5 @@
 /* VMSystem.java -- helper for java.lang.system
-   Copyright (C) 1998, 2002, 2004 Free Software Foundation
+   Copyright (C) 1998, 2002, 2004, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -56,6 +56,9 @@ import java.io.PrintStream;
  */
 final class VMSystem
 {
+
+  private VMSystem() {} // Prohibits instantiation.
+
   /**
    * Copy one array onto another from <code>src[srcStart]</code> ...
    * <code>src[srcStart+len-1]</code> to <code>dest[destStart]</code> ...
@@ -95,15 +98,6 @@ final class VMSystem
   static native int identityHashCode(Object o);
 
   /**
-   * Convert a library name to its platform-specific variant.
-   *
-   * @param libname the library name, as used in <code>loadLibrary</code>
-   * @return the platform-specific mangling of the name
-   * @XXX Add this method
-  static native String mapLibraryName(String libname);
-   */
-
-  /**
    * Set {@link System#in} to a new InputStream.
    *
    * @param in the new InputStream
@@ -135,10 +129,7 @@ final class VMSystem
    * @return the current time
    * @see java.util.Date
    */
-   public static long currentTimeMillis()
-   {
-     return nanoTime() / 1000000L;
-   }
+  static native long currentTimeMillis();
 
   /**
    * <p>
@@ -165,7 +156,7 @@ final class VMSystem
    * @return the time of a system timer in nanoseconds.
    * @since 1.5
    */
-  public static native long nanoTime();
+  static native long nanoTime();
 
   /**
    * Returns a list of 'name=value' pairs representing the current environment