svn commit: r764411 - in /commons/sandbox/runtime/trunk/src/main/native/os: hpux/os.c linux/os.c win32/os.c

[mturk]

Author: mturk
Date: Mon Apr 13 11:16:46 2009
New Revision: 764411

URL: http://svn.apache.org/viewvc?rev=764411&view=rev
Log:
Return ia32 insted x86 where possible

Modified:
    commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
    commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
    commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c

Modified: commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c?rev=764411&r1=764410&r2=764411&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/hpux/os.c Mon Apr 13 
11:16:46 2009
@@ -99,7 +99,7 @@
 #if CC_SIZEOF_VOIDP == 8
     return CSTR_TO_JSTRING("ia64");
 #else
-    return CSTR_TO_JSTRING("x86");
+    return CSTR_TO_JSTRING("ia32");
 #endif
 #endif
 }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c?rev=764411&r1=764410&r2=764411&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/linux/os.c Mon Apr 13 
11:16:46 2009
@@ -92,7 +92,7 @@
 #if CC_SIZEOF_VOIDP == 8
             return CSTR_TO_JSTRING(sys.machine);
 #else
-            return CSTR_TO_JSTRING("x86");
+            return CSTR_TO_JSTRING("ia32");
 #endif
         }
     }

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c?rev=764411&r1=764410&r2=764411&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/os.c Mon Apr 13 
11:16:46 2009
@@ -161,9 +161,12 @@
         case PROCESSOR_ARCHITECTURE_IA64:
             strcpy(buf, "ia64");
         case PROCESSOR_ARCHITECTURE_INTEL:
-            if (acr_osinf->wProcessorLevel < 8)
+#if !defined(_WIN64)
+            if (acr_osinf->wProcessorLevel > 2 && acr_osinf->wProcessorLevel < 
7)
                 sprintf(buf, "i%d86", acr_osinf->wProcessorLevel);
-            else {
+            else
+#endif
+                       {
                 /* TODO: Figure out the proper names for
                  * other Intel processors
                  */
@@ -202,9 +205,12 @@
         case PROCESSOR_ARCHITECTURE_IA64:
             strcpy(buf, "ia64");
         case PROCESSOR_ARCHITECTURE_INTEL:
-            if (acr_osinf->wProcessorLevel < 8)
+#if !defined(_WIN64)
+            if (acr_osinf->wProcessorLevel > 2 && acr_osinf->wProcessorLevel < 
7)
                 sprintf(buf, "i%d86", acr_osinf->wProcessorLevel);
-            else {
+            else
+#endif
+            {
                 /* TODO: Figure out the proper names for
                  * other Intel processors
                  */