diff options
| author | trims <none@none> | 2010-05-21 14:03:49 -0700 |
|---|---|---|
| committer | trims <none@none> | 2010-05-21 14:03:49 -0700 |
| commit | 8ac08cffc01444dcbc5f550a89b2d1e30a2bd1de (patch) | |
| tree | 0dbff521799247f7d45d57926aec9c4f333324f8 | |
| parent | f1683f0b6682534d53c9a8672b5190a03a65dff3 (diff) | |
| parent | 9437655bb2ad18db5fa2fe08c02580644bfadae7 (diff) | |
Mergejdk7-b95
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | src/share/vm/interpreter/bytecodes.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -95,4 +95,5 @@ e0a1a502e402dbe7bf2d9102b4084a7e79a99a9b jdk7-b91 3221d1887d30341bedfdac1dbf365ea41beff20f jdk7-b92 310cdbc355355a13aa53c002b6bde4a8c5ba67ff hs18-b04 9d865fc2f644fdd9a0108fd6407944ee610aadd9 jdk7-b93 +d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94 8bfe9058ca4661779ac1d0572329f3943e68362e hs19-b01 diff --git a/src/share/vm/interpreter/bytecodes.cpp b/src/share/vm/interpreter/bytecodes.cpp index 46d2727fa..c507bf42b 100644 --- a/src/share/vm/interpreter/bytecodes.cpp +++ b/src/share/vm/interpreter/bytecodes.cpp @@ -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; |