Mercurial > hg > graal-jvmci-8
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vm_version.cpp Thu Oct 10 18:26:22 2013 +0200 +++ b/src/share/vm/runtime/vm_version.cpp Fri Oct 11 10:38:03 2013 +0200 @@ -235,6 +235,8 @@ #define HOTSPOT_BUILD_COMPILER "Workshop 5.9" #elif __SUNPRO_CC == 0x5100 #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1" + #elif __SUNPRO_CC == 0x5120 + #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3" #else #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) #endif