Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/vm_version.cpp @ 14124:7ad529321294
make: remove GRAALVM and introduce COMPILERGRAAL. fix client hosted-mode
| author | Bernhard Urban <bernhard.urban@jku.at> |
|---|---|
| date | Mon, 10 Mar 2014 16:26:10 +0100 |
| parents | 800057208a2c |
| children | d8041d695d19 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp Mon Mar 10 16:20:45 2014 +0100 +++ b/src/share/vm/runtime/vm_version.cpp Mon Mar 10 16:26:10 2014 +0100 @@ -112,26 +112,23 @@ #ifndef VMTYPE #ifdef TIERED - #ifdef GRAAL + #ifdef COMPILERGRAAL #define VMTYPE "Graal" - #else + #else // COMPILERGRAAL #define VMTYPE "Server" - #endif + #endif // COMPILERGRAAL #else // TIERED - #ifdef ZERO - #ifdef SHARK - #define VMTYPE "Shark" - #else // SHARK - #define VMTYPE "Zero" - #endif // SHARK - #else // ZERO - #ifdef GRAALVM - #define VMTYPE "Graal" - #else // GRAALVM - #define VMTYPE COMPILER1_PRESENT("Client") \ - COMPILER2_PRESENT("Server") - #endif // GRAALVM - #endif // ZERO + #ifdef ZERO + #ifdef SHARK + #define VMTYPE "Shark" + #else // SHARK + #define VMTYPE "Zero" + #endif // SHARK + #else // ZERO + #define VMTYPE COMPILER1_PRESENT("Client") \ + COMPILER2_PRESENT("Server") \ + COMPILERGRAAL_PRESENT("Graal") + #endif // ZERO #endif // TIERED #endif