Mercurial > hg > truffle
diff src/share/vm/runtime/vm_version.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | 33df1aeaebbf 9855b7e559ae |
| children | 5d0bb7d52783 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/runtime/vm_version.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -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 @@ -45,6 +45,10 @@ const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release(); const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string(); bool Abstract_VM_Version::_supports_cx8 = false; +bool Abstract_VM_Version::_supports_atomic_getset4 = false; +bool Abstract_VM_Version::_supports_atomic_getset8 = false; +bool Abstract_VM_Version::_supports_atomic_getadd4 = false; +bool Abstract_VM_Version::_supports_atomic_getadd8 = false; unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U; int Abstract_VM_Version::_reserve_for_allocation_prefetch = 0; @@ -106,28 +110,30 @@ #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 -#ifdef GRAAL - #define VMTYPE "Graal" -#else // GRAAL - #define VMTYPE COMPILER1_PRESENT("Client") \ - COMPILER2_PRESENT("Server") -#endif // GRAAL -#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 + #ifdef GRAAL + #define VMTYPE "Graal" + #else // GRAAL + #define VMTYPE COMPILER1_PRESENT("Client") \ + COMPILER2_PRESENT("Server") + #endif // GRAAL + #endif // ZERO + #endif // TIERED + #endif // KERNEL +#endif #ifndef HOTSPOT_VM_DISTRO #error HOTSPOT_VM_DISTRO must be defined