Mercurial > hg > release > icedtea7-forest-2.3 > hotspot

changeset 3520:2c04ea9341f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7170275: os::print_os_info needs to know about Windows 8 Summary: Recognize Windows 8 and Windows Server 2012 Reviewed-by: sla, kvn, azeemj
author mikael
date Wed, 06 Jun 2012 05:21:56 +0200
parents 4cbb838572a3
children ed206bb84d16 1bc0c1354c4d
files src/os/windows/vm/os_windows.cpp
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/windows/vm/os_windows.cpp	Fri Jun 01 20:17:46 2012 +0200
+++ b/src/os/windows/vm/os_windows.cpp	Wed Jun 06 05:21:56 2012 +0200
@@ -1601,7 +1601,8 @@
     case 5001: st->print(" Windows XP"); break;
     case 5002:
     case 6000:
-    case 6001: {
+    case 6001:
+    case 6002: {
       // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could
       // find out whether we are running on 64 bit processor or not.
       SYSTEM_INFO si;
@@ -1633,6 +1634,14 @@
         }
         if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
             st->print(" , 64 bit");
+      } else if (os_vers == 6002) {
+        if (osvi.wProductType == VER_NT_WORKSTATION) {
+            st->print(" Windows 8");
+        } else {
+            st->print(" Windows Server 2012");
+        }
+        if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+            st->print(" , 64 bit");
       } else { // future os
         // Unrecognized windows, print out its major and minor versions
         st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion);