Mercurial > hg > truffle
diff src/share/vm/runtime/vm_version.cpp @ 6911:d2582a08fa5d
Merge
author | asaha |
---|---|
date | Thu, 18 Oct 2012 21:58:55 -0700 |
parents | 9855b7e559ae |
children | e522a00b91aa 6b881a6b0665 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp Thu Oct 11 15:29:16 2012 -0700 +++ b/src/share/vm/runtime/vm_version.cpp Thu Oct 18 21:58:55 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -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