Mercurial > hg > truffle

diff src/share/vm/runtime/vm_version.cpp @ 6856:9855b7e559ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author collins
date Fri, 12 Oct 2012 10:49:39 -0700
parents b9a9ed0f8eeb fb19af007ffc
children e522a00b91aa 6b881a6b0665
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp	Tue Oct 09 10:09:34 2012 -0700
+++ b/src/share/vm/runtime/vm_version.cpp	Fri Oct 12 10:49:39 2012 -0700
@@ -110,24 +110,26 @@
   #define VMLP ""
 #endif
 
-#ifdef KERNEL
-  #define VMTYPE "Kernel"
-#else // KERNEL
-#ifdef TIERED
-  #define VMTYPE "Server"
-#else // TIERED
-#ifdef ZERO
-#ifdef SHARK
-  #define VMTYPE "Shark"
-#else // SHARK
-  #define VMTYPE "Zero"
-#endif // SHARK
-#else // ZERO
-   #define VMTYPE COMPILER1_PRESENT("Client")   \
-                  COMPILER2_PRESENT("Server")
-#endif // ZERO
-#endif // TIERED
-#endif // KERNEL
+#ifndef VMTYPE
+  #ifdef KERNEL
+    #define VMTYPE "Kernel"
+  #else // KERNEL
+  #ifdef TIERED
+    #define VMTYPE "Server"
+  #else // TIERED
+  #ifdef ZERO
+  #ifdef SHARK
+    #define VMTYPE "Shark"
+  #else // SHARK
+    #define VMTYPE "Zero"
+  #endif // SHARK
+  #else // ZERO
+     #define VMTYPE COMPILER1_PRESENT("Client")   \
+                    COMPILER2_PRESENT("Server")
+  #endif // ZERO
+  #endif // TIERED
+  #endif // KERNEL
+#endif
 
 #ifndef HOTSPOT_VM_DISTRO
   #error HOTSPOT_VM_DISTRO must be defined