Index: java/lang/String.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v
retrieving revision 1.59
diff -u -r1.59 String.java
--- java/lang/String.java	17 Nov 2004 14:46:24 -0000	1.59
+++ java/lang/String.java	10 Dec 2004 11:38:17 -0000
@@ -414,7 +414,7 @@
         if ((count << 2) < buffer.value.length)
           {
             value = new char[count];
-            System.arraycopy(buffer.value, 0, value, 0, count);
+            VMSystem.arraycopy(buffer.value, 0, value, 0, count);
           }
         else
           {
@@ -446,7 +446,7 @@
     else
       {
         value = new char[count];
-        System.arraycopy(data, offset, value, 0, count);
+        VMSystem.arraycopy(data, offset, value, 0, count);
         this.offset = 0;
       }
     this.count = count;
@@ -496,7 +496,7 @@
   {
     if (srcBegin < 0 || srcBegin > srcEnd || srcEnd > count)
       throw new StringIndexOutOfBoundsException();
-    System.arraycopy(value, srcBegin + offset,
+    VMSystem.arraycopy(value, srcBegin + offset,
                      dst, dstBegin, srcEnd - srcBegin);
   }
 
@@ -1056,8 +1056,8 @@
     if (count == 0)
       return str;
     char[] newStr = new char[count + str.count];
-    System.arraycopy(value, offset, newStr, 0, count);
-    System.arraycopy(str.value, str.offset, newStr, count, str.count);
+    VMSystem.arraycopy(value, offset, newStr, 0, count);
+    VMSystem.arraycopy(str.value, str.offset, newStr, count, str.count);
     // Package constructor avoids an array copy.
     return new String(newStr, 0, newStr.length, true);
   }
@@ -1398,7 +1398,7 @@
     // if (count == value.length)
     //   return (char[]) value.clone();
     char[] copy = new char[count];
-    System.arraycopy(value, offset, copy, 0, count);
+    VMSystem.arraycopy(value, offset, copy, 0, count);
     return copy;
   }
 
@@ -1637,7 +1637,7 @@
       {
 	int count = s.count;
 	value = new char[count];
-	System.arraycopy(s.value, s.offset, value, 0, count);
+	VMSystem.arraycopy(s.value, s.offset, value, 0, count);
       }
 
     return value;