From 2e05c10e0f88b19eab3d52d754e5b4090b890ee0 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 26 Jul 2003 23:17:06 +0000
Subject: [PATCH] 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69837 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 8 ++++++++
libjava/win32.cc | 23 ++++++++++++-----------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 546109e1ad1d..ef301dc8cc6a 100644
--- 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 6fc2de08760c..9597dc8bc1e4 100644
--- 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;
--
GitLab