--- a/hotspot/make/solaris/makefiles/dtrace.make Thu Sep 16 13:45:55 2010 -0700
+++ b/hotspot/make/solaris/makefiles/dtrace.make Fri Sep 17 19:45:12 2010 -0400
@@ -165,7 +165,7 @@
$(DTRACE.o): $(DTRACE).d $(JVMOFFS).h $(JVMOFFS)Index.h $(DTraced_Files)
@echo Compiling $(DTRACE).d
- $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -o $@ -s $(DTRACE).d \
+ $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -xlazyload -o $@ -s $(DTRACE).d \
$(DTraced_Files) ||\
STATUS=$$?;\
if [ x"$$STATUS" = x"1" -a \
--- a/hotspot/src/share/vm/runtime/arguments.cpp Thu Sep 16 13:45:55 2010 -0700
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Fri Sep 17 19:45:12 2010 -0400
@@ -121,7 +121,7 @@
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.name",
"Java Virtual Machine Specification", false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.specification.vendor",
- "Sun Microsystems Inc.", false));
+ JDK_Version::is_gte_jdk17x_version() ? "Oracle Corporation" : "Sun Microsystems Inc.", false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.version", VM_Version::vm_release(), false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.name", VM_Version::vm_name(), false));
PropertyList_add(&_system_properties, new SystemProperty("java.vm.vendor", VM_Version::vm_vendor(), false));
--- a/hotspot/src/share/vm/runtime/vm_version.cpp Thu Sep 16 13:45:55 2010 -0700
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp Fri Sep 17 19:45:12 2010 -0400
@@ -121,7 +121,8 @@
#ifdef VENDOR
return XSTR(VENDOR);
#else
- return "Sun Microsystems Inc.";
+ return JDK_Version::is_gte_jdk17x_version() ?
+ "Oracle Corporation" : "Sun Microsystems Inc.";
#endif
}
--- a/hotspot/test/runtime/6626217/Test6626217.sh Thu Sep 16 13:45:55 2010 -0700
+++ b/hotspot/test/runtime/6626217/Test6626217.sh Fri Sep 17 19:45:12 2010 -0400
@@ -1,9 +1,27 @@
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
-#
+#
+# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
-#
+
# @test @(#)Test6626217.sh
# @bug 6626217
# @summary Loader-constraint table allows arrays instead of only the base-classes
@@ -96,6 +114,6 @@
${RM} many_loader.java
${JAVA} ${BIT_FLAG} -Xverify -Xint -cp . bug_21227 >test.out 2>&1
-grep "violates loader constraints" test.out
+grep "loader constraint" test.out
exit $?