src/share/vm/runtime/vm_version.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File hotspot-npg Cdiff src/share/vm/runtime/vm_version.cpp

src/share/vm/runtime/vm_version.cpp

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 1998, 2011, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. --- 1,7 ---- /* ! * 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 104,131 **** #define VMLP "64-Bit " #else #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 HOTSPOT_VM_DISTRO #error HOTSPOT_VM_DISTRO must be defined #endif #define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM" --- 104,133 ---- #define VMLP "64-Bit " #else #define VMLP "" #endif ! #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 #endif #define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM"
src/share/vm/runtime/vm_version.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File