From 48a96f5133f33adaadbc0187503a35f03f1348ac Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Fri, 21 Aug 2009 13:03:31 -0700 Subject: [PATCH] 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. --- vm/Properties.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/vm/Properties.c b/vm/Properties.c index 9cfa02216..91288c27f 100644 --- 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")); -- 2.11.0