Mercurial > hg > truffle
changeset 1551:7c6ae41266c5
Merge
| author | trims |
|---|---|
| date | Thu, 27 May 2010 12:42:44 -0700 |
| parents | 503a1a5856f1 (diff) c9a07413e82b (current diff) |
| children | c18cbe5936b8 |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu May 20 08:32:11 2010 -0700 +++ b/.hgtags Thu May 27 12:42:44 2010 -0700 @@ -94,3 +94,6 @@ 25f53b53aaa3eb8b2d5391a1e8de9a76ae1dd8a2 hs18-b03 3221d1887d30341bedfdac1dbf365ea41beff20f jdk7-b92 310cdbc355355a13aa53c002b6bde4a8c5ba67ff hs18-b04 +9d865fc2f644fdd9a0108fd6407944ee610aadd9 jdk7-b93 +d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94 +8bfe9058ca4661779ac1d0572329f3943e68362e hs19-b01
--- a/make/hotspot_version Thu May 20 08:32:11 2010 -0700 +++ b/make/hotspot_version Thu May 27 12:42:44 2010 -0700 @@ -35,7 +35,7 @@ HS_MAJOR_VER=19 HS_MINOR_VER=0 -HS_BUILD_NUMBER=01 +HS_BUILD_NUMBER=02 JDK_MAJOR_VER=1 JDK_MINOR_VER=7
--- a/src/share/vm/interpreter/bytecodes.cpp Thu May 20 08:32:11 2010 -0700 +++ b/src/share/vm/interpreter/bytecodes.cpp Thu May 27 12:42:44 2010 -0700 @@ -26,11 +26,13 @@ #include "incls/_bytecodes.cpp.incl" +#if defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER < 1600)) // Windows AMD64 Compiler Hangs compiling this file // unless optimization is off #ifdef _M_AMD64 #pragma optimize ("", off) #endif +#endif bool Bytecodes::_is_initialized = false;