From: Anthony Green <green@redhat.com>
Date: Fri, 18 Feb 2005 23:29:44 +0000 (+0000)
Subject: natRuntime.cc (insertSystemProperties): Normalize x86 architecture names to "i386... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=95432490dbe5109141da938f66f0abf210886ac4;p=gcc.git

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

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
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e28cc6e12ee..6f14af2d88e 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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.
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index 0f3b7987af4..37d7b4b61e2 100644
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -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
     {