Set os.arch property from uname().machine.

Not sure why we didn't just do this in the first place.  I get "x86_64"
on desktop and "armv6l" on a sapphire.

diff --git a/vm/Properties.c b/vm/Properties.c
index 9cfa022..91288c2 100644 (file)
--- a/vm/Properties.c
+++ b/vm/Properties.c
@@ -187,14 +187,7 @@ void dvmCreateDefaultProperties(Object* propObj)
     setProperty(propObj, put, "java.specification.vendor", projectName);
     setProperty(propObj, put, "java.specification.version", "0.9");
 
-    #define OS_ARCH generic /* TODO: Use an "arch" header. */
-    #define OS_ARCH_QUOTE1(x) #x
-    #define OS_ARCH_QUOTE(x) OS_ARCH_QUOTE1(x)
-    setProperty(propObj, put, "os.arch", OS_ARCH_QUOTE(OS_ARCH));
-    #undef OS_ARCH
-    #undef OS_ARCH_QUOTE1
-    #undef OS_ARCH_QUOTE
-
+    setProperty(propObj, put, "os.arch", info.machine);
     setProperty(propObj, put, "os.name", info.sysname);
     setProperty(propObj, put, "os.version", info.release);
     setProperty(propObj, put, "user.home", getenv("HOME"));