win32.cc (_Jv_platform_initProperties): Use generic names like "x86" for the "os...

2003-07-26  Ranjit Mathew  <rmathew@hotmail.com>

	* win32.cc (_Jv_platform_initProperties): Use generic names
	like "x86" for the "os.arch" property to be consistent with
	what Sun's JDK produces. Use the wProcessorArchitecture
	member of the Win32 SYSTEM_INFO structure, filled in a call
	to GetSystemInfo( ), instead of dwProcessorType.

From-SVN: r69837

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 546109e1ad1d24517234cb4cbb663bcc68eea638..ef301dc8cc6ab2090a5eb494176b320405884616 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-26  Ranjit Mathew  <rmathew@hotmail.com>
+
+       * win32.cc (_Jv_platform_initProperties): Use generic names
+       like "x86" for the "os.arch" property to be consistent with
+       what Sun's JDK produces. Use the wProcessorArchitecture
+       member of the Win32 SYSTEM_INFO structure, filled in a call 
+       to GetSystemInfo( ), instead of dwProcessorType.
+
 2003-07-26  Mohan Embar  <gnustuff@thisiscool.com>
            Ranjit Mathew  <rmathew@hotmail.com>
 

diff --git a/libjava/win32.cc b/libjava/win32.cc
index 6fc2de08760c8bca5e023823852faed1d5791d32..9597dc8bc1e45c678ed0ecab70d4262025921087 100644 (file)
--- a/libjava/win32.cc
+++ b/libjava/win32.cc
@@ -186,23 +186,24 @@ _Jv_platform_initProperties (java::util::Properties* newprops)
   // Set the OS architecture.
   SYSTEM_INFO si;
   GetSystemInfo (&si);
-  switch (si.dwProcessorType)
+  switch (si.wProcessorArchitecture)
     {
-      case PROCESSOR_INTEL_386:
-        SET ("os.arch", "i386");
+      case PROCESSOR_ARCHITECTURE_INTEL:
+        SET ("os.arch", "x86");
         break;
-      case PROCESSOR_INTEL_486:
-        SET ("os.arch", "i486");
+      case PROCESSOR_ARCHITECTURE_MIPS:
+        SET ("os.arch", "mips");
         break;
-      case PROCESSOR_INTEL_PENTIUM:
-        SET ("os.arch", "i586");
+      case PROCESSOR_ARCHITECTURE_ALPHA:
+        SET ("os.arch", "alpha");
         break;
-      case PROCESSOR_MIPS_R4000:       
-        SET ("os.arch", "MIPS4000");
+      case PROCESSOR_ARCHITECTURE_PPC: 
+        SET ("os.arch", "ppc");
         break;
-      case PROCESSOR_ALPHA_21064:
-        SET ("os.arch", "ALPHA");
+      case PROCESSOR_ARCHITECTURE_IA64:
+        SET ("os.arch", "ia64");
         break;
+      case PROCESSOR_ARCHITECTURE_UNKNOWN:
       default:
         SET ("os.arch", "unknown");
         break;