Mercurial > hg > truffle
comparison src/share/vm/runtime/vm_version.cpp @ 8883:b9a918201d47
Merge with hsx25
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Sat, 06 Apr 2013 20:04:06 +0200 |
parents | 5fc51c1ecdeb 9960dce2024f |
children | cefad50507d8 |
comparison
equal
deleted
inserted
replaced
8660:d47b52b0ff68 | 8883:b9a918201d47 |
---|---|
213 #define HOTSPOT_BUILD_COMPILER "MS VC++ 7.1 (VS2003)" | 213 #define HOTSPOT_BUILD_COMPILER "MS VC++ 7.1 (VS2003)" |
214 #elif _MSC_VER == 1400 | 214 #elif _MSC_VER == 1400 |
215 #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0 (VS2005)" | 215 #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0 (VS2005)" |
216 #elif _MSC_VER == 1500 | 216 #elif _MSC_VER == 1500 |
217 #define HOTSPOT_BUILD_COMPILER "MS VC++ 9.0 (VS2008)" | 217 #define HOTSPOT_BUILD_COMPILER "MS VC++ 9.0 (VS2008)" |
218 #elif _MSC_VER == 1600 | |
219 #define HOTSPOT_BUILD_COMPILER "MS VC++ 10.0 (VS2010)" | |
220 #elif _MSC_VER == 1700 | |
221 #define HOTSPOT_BUILD_COMPILER "MS VC++ 11.0 (VS2012)" | |
218 #else | 222 #else |
219 #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER) | 223 #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER) |
220 #endif | 224 #endif |
221 #elif defined(__SUNPRO_CC) | 225 #elif defined(__SUNPRO_CC) |
222 #if __SUNPRO_CC == 0x420 | 226 #if __SUNPRO_CC == 0x420 |