comparison src/share/vm/runtime/vm_version.cpp @ 14412:e2722a66aba7

Merge
author kvn
date Thu, 05 Sep 2013 11:04:39 -0700
parents bdd155477289 9d6c9b0a8f15
children d8041d695d19
comparison
equal deleted inserted replaced
14411:bdd155477289 14412:e2722a66aba7
231 #define HOTSPOT_BUILD_COMPILER "Workshop 5.8" 231 #define HOTSPOT_BUILD_COMPILER "Workshop 5.8"
232 #elif __SUNPRO_CC == 0x590 232 #elif __SUNPRO_CC == 0x590
233 #define HOTSPOT_BUILD_COMPILER "Workshop 5.9" 233 #define HOTSPOT_BUILD_COMPILER "Workshop 5.9"
234 #elif __SUNPRO_CC == 0x5100 234 #elif __SUNPRO_CC == 0x5100
235 #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1" 235 #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1"
236 #elif __SUNPRO_CC == 0x5120
237 #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3"
236 #else 238 #else
237 #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) 239 #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
238 #endif 240 #endif
239 #elif defined(__GNUC__) 241 #elif defined(__GNUC__)
240 #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__ 242 #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__