Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/vm_version.cpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | b9a918201d47 9d6c9b0a8f15 |
children | 359f7e70ae7f |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
233 #define HOTSPOT_BUILD_COMPILER "Workshop 5.8" | 233 #define HOTSPOT_BUILD_COMPILER "Workshop 5.8" |
234 #elif __SUNPRO_CC == 0x590 | 234 #elif __SUNPRO_CC == 0x590 |
235 #define HOTSPOT_BUILD_COMPILER "Workshop 5.9" | 235 #define HOTSPOT_BUILD_COMPILER "Workshop 5.9" |
236 #elif __SUNPRO_CC == 0x5100 | 236 #elif __SUNPRO_CC == 0x5100 |
237 #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1" | 237 #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1" |
238 #elif __SUNPRO_CC == 0x5120 | |
239 #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3" | |
238 #else | 240 #else |
239 #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) | 241 #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) |
240 #endif | 242 #endif |
241 #elif defined(__GNUC__) | 243 #elif defined(__GNUC__) |
242 #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__ | 244 #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__ |