mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 22:41:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

natRuntime.cc (insertSystemProperties): Normalize x86 architecture names to "i386" for compatibility reasons.

Browse Source 
2005-02-18  Anthony Green  <green@redhat.com>

        * java/lang/natRuntime.cc (insertSystemProperties): Normalize x86
        architecture names to "i386" for compatibility reasons.  Win32
        still uses "x86".

From-SVN: r95243
This commit is contained in:
Anthony Green 2005-02-18 23:29:44 +00:00 committed by Anthony Green
parent f36b89e08d
commit 95432490db
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2005-02-18 Anthony Green <green@redhat.com>
* java/lang/natRuntime.cc (insertSystemProperties): Normalize x86
architecture names to "i386" for compatibility reasons. Win32
still uses "x86".
2005-02-18 Anthony Green <green@redhat.com>
* gij.cc (version): Change year for '--version' to 2005.

12
libjava/java/lang/natRuntime.cc
View File

@ -436,8 +436,18 @@ java::lang::Runtime::insertSystemProperties (java::util::Properties *newprops)
if (! uname (&u))
{
SET ("os.name", u.sysname);
SET ("os.arch", u.machine);
SET ("os.version", u.release);
// Normalize x86 architecture names to "i386" (except on Windows, which
// is handled in win32.cc).
if (u.machine[0] == 'i'
&& u.machine[1] != 0
&& u.machine[2] == '8'
&& u.machine[3] == '6'
&& u.machine[4] == 0)
SET ("os.arch", "i386");
else
SET ("os.arch", u.machine);
}
else
{