Changeset 390 for trunk/openjdk/hotspot/src/os_cpu

Timestamp:

Jul 2, 2012, 3:05:26 PM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b25 from branches/vendor/oracle.

This accompanies an incomplete r389.

Location:

trunk/openjdk/hotspot/src/os_cpu

Files:

• os2_x86/vm/os2_x86_32.s (modified) (1 prop)
• solaris_sparc/vm/os_solaris_sparc.cpp (modified) (1 diff)
• solaris_sparc/vm/vm_version_solaris_sparc.cpp (modified) (1 diff)
• solaris_x86/vm/os_solaris_x86.cpp (modified) (1 diff)

trunk/openjdk/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp

@@ -1 +1 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *

trunk/openjdk/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp

@@ -203 +203 @@
               }
             } else {
-              assert(strstr(impl, "SPARC") != NULL, "should be sparc");
+#ifndef PRODUCT
+              if (strstr(impl, "SPARC") == NULL) {
+                 warning("WARNING: cpu implementation = '%s', should contain SPARC", impl);
+              }
+#endif
             }
             free((void*)impl);

trunk/openjdk/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp

@@ -1 +1 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *