Merge

b71af898 · trims · 6902cedc · 49b5e2d2 · b71af898 · b71af898
隐藏空白更改
内联并排

Showing with 3 addition and 0 deletion

.hgtags .hgtags +1 -0

src/share/vm/interpreter/bytecodes.cpp src/share/vm/interpreter/bytecodes.cpp +2 -0

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -95,4 +95,5 @@ e0a1a502e402dbe7bf2d9102b4084a7e79a99a9b jdk7-b91
 3221d1887d30341bedfdac1dbf365ea41beff20f jdk7-b92
 310cdbc355355a13aa53c002b6bde4a8c5ba67ff hs18-b04
 9d865fc2f644fdd9a0108fd6407944ee610aadd9 jdk7-b93
+d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94
 8bfe9058ca4661779ac1d0572329f3943e68362e hs19-b01
--- 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;