git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32.cc (_Jv_platform_initProperties): Use generic names like "x86" for the "os.arch" property to be consistent with... 

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
This commit is contained in:
Ranjit Mathew 2003-07-26 23:17:06 +00:00 committed by Tom Tromey
parent d6f6aaf66c
commit 14a5a676c1
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -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> 2003-07-26 Mohan Embar <gnustuff@thisiscool.com>
Ranjit Mathew <rmathew@hotmail.com> Ranjit Mathew <rmathew@hotmail.com>

23
libjava/win32.cc
View File

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