AI 144304: The initialization of "os.arch" used insufficient stringification.

  We now return "generic" instead of "OS_ARCH", which isn't terribly
  useful but is what we originally intended.

Automated import of CL 144304

diff --git a/vm/Properties.c b/vm/Properties.c
index a9fe5e1..7758660 100644 (file)
--- a/vm/Properties.c
+++ b/vm/Properties.c
@@ -186,9 +186,11 @@ void dvmCreateDefaultProperties(Object* propObj)
     setProperty(propObj, put, "java.specification.version", "0.9");
 
     #define OS_ARCH generic /* TODO: Use an "arch" header. */
-    #define OS_ARCH_QUOTE(x) #x
+    #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.name", info.sysname);