Mercurial > hg > truffle

comparison src/share/vm/runtime/vm_version.cpp @ 7226:8a3efb8c831d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 13:02:49 +0100
parents 5d0bb7d52783
children 291ffc492eb6
comparison
equal deleted inserted replaced
7225:31c4d9f9e922 7226:8a3efb8c831d
122 #define VMTYPE "Shark" 122 #define VMTYPE "Shark"
123 #else // SHARK 123 #else // SHARK
124 #define VMTYPE "Zero" 124 #define VMTYPE "Zero"
125 #endif // SHARK 125 #endif // SHARK
126 #else // ZERO 126 #else // ZERO
127 #ifdef GRAAL 127 #ifdef GRAALVM
128 #define VMTYPE "Graal" 128 #define VMTYPE "Graal"
129 #else // GRAAL 129 #else // GRAAL
130 #define VMTYPE COMPILER1_PRESENT("Client") \ 130 #define VMTYPE COMPILER1_PRESENT("Client") \
131 COMPILER2_PRESENT("Server") 131 COMPILER2_PRESENT("Server")
132 #endif // GRAAL 132 #endif // GRAAL