Skip to content

D
dragonwell11

openanolis / dragonwell11

通知 7
Star 2
Fork 0
D
dragonwell11

体验新版 GitCode，发现更多精彩内容 >>

提交 67eeac83 编写于 作者: T twisti
浏览文件
操作

Merge

上级 2e83c478 04e1947e
隐藏空白更改
内联 并排
Showing with 15 addition and 5 deletion
.hgtags
浏览文件 @ 67eeac83
......@@ -100,3 +100,4 @@ a4e6aa1f45ad23a6f083ed98d970b5006ea4d292 jdk7-b116
142129d8599d1f56b29387e7f9a5fad53b6d61df jdk7-b123
aa894c225b1a517b665ac2a58295217ea2245134 jdk7-b124
f658ec2730fa29323c36d23c27e54c7219ef5e16 jdk7-b125
f1df068076986679ea1105532a65529d63a89060 jdk7-b126
.hgtags-top-repo
浏览文件 @ 67eeac83
......@@ -100,3 +100,4 @@ f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122
ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123
024a6755895bf91b5a3c98984c89ee018efbf538 jdk7-b124
5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125
b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
corba/.hgtags
浏览文件 @ 67eeac83
......@@ -100,3 +100,4 @@ cff5a173ec1e89013359e804a3e31736ef6fb462 jdk7-b120
a230c142628cea22475ab9dc5cd544266ddf2466 jdk7-b123
f90b3e014e831eb4f32ef035a1dad2b8ba87949f jdk7-b124
1ce58c72b7892cb813eb920276c7e7f17a1b79fe jdk7-b125
d7532bcd3742f1576dd07ff9fbb535c9c9a276e9 jdk7-b126
hotspot/.hgtags
浏览文件 @ 67eeac83
......@@ -141,4 +141,6 @@ f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120
0a8e0d4345b37b71ec49dda08ee03b68c4f1b592 jdk7-b124
0a8e0d4345b37b71ec49dda08ee03b68c4f1b592 hs20-b05
e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 jdk7-b125
4c851c931d001a882cab809aaf3a55371b919244 jdk7-b126
e24ab3fa6aafad3efabbe7dba9918c5f461a20b1 hs20-b06
d535bf4c12355a2897e918da9f8910c0aceec4fb hs20-b07
hotspot/make/hotspot_version
浏览文件 @ 67eeac83
......@@ -33,9 +33,9 @@
# Don't put quotes (fail windows build).
HOTSPOT_VM_COPYRIGHT=Copyright 2011
HS_MAJOR_VER=20
HS_MAJOR_VER=21
HS_MINOR_VER=0
HS_BUILD_NUMBER=07
HS_BUILD_NUMBER=01
JDK_MAJOR_VER=1
JDK_MINOR_VER=7
......
hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
浏览文件 @ 67eeac83
......@@ -343,9 +343,10 @@ OopMapSet* Runtime1::generate_patching(StubAssembler* sasm, address target) {
// returned.
restore_live_registers(sasm);
__ restore();
__ br(Assembler::always, false, Assembler::pt, deopt_blob->unpack_with_reexecution(), relocInfo::runtime_call_type);
__ delayed()->nop();
AddressLiteral dest(deopt_blob->unpack_with_reexecution());
__ jump_to(dest, O0);
__ delayed()->restore();
__ bind(no_deopt);
restore_live_registers(sasm);
......
jaxp/.hgtags
浏览文件 @ 67eeac83
......@@ -100,3 +100,4 @@ b2f6d9c4f12ffd307a5de40455b2b61b31a5cb79 jdk7-b118
e2aedea6495d61557326928de20dbb2d78fdd9aa jdk7-b123
57ed1f3bec72924cdad102f9bf90f7449ea7bb83 jdk7-b124
6c9bdee0cc3a8912acc5189cc092b8cba6851f9d jdk7-b125
2fde639439c1fb3fbc44f533d48bb2916e813312 jdk7-b126
jaxws/.hgtags
浏览文件 @ 67eeac83
......@@ -100,3 +100,4 @@ a4f2e1ca67163ef79555082809d7cd719893c338 jdk7-b120
5a8e43bcce56b7cd5576419067a929b74575ae71 jdk7-b123
86f60e5b3975840968f3147ddce047a27a9fc83e jdk7-b124
d72eea121c3bc2b649272a37b80d9417855b7146 jdk7-b125
6d772c5119d5e247bc98a57ce8b1be121554ee0a jdk7-b126
jdk/.hgtags
浏览文件 @ 67eeac83
......@@ -100,3 +100,4 @@ ac311eb325bfc763698219252bf3cee9e091f3af jdk7-b122
869190935eedee7750d955019ab2a1b80f0a13a8 jdk7-b123
1c72adc9d5f331cb882cf5354ba0dcb118a60b23 jdk7-b124
0a56bdd709d01c1663047e55201d19152ffd3d69 jdk7-b125
8361ef97a0f90086c9048beaf7cea1a37216c4cd jdk7-b126
langtools/.hgtags
浏览文件 @ 67eeac83
......@@ -100,3 +100,4 @@ c491eec0acc73fa41b77e1619ed03e56d8a75b83 jdk7-b118
a3b5b531542a372f30e014b1543a619a15a90780 jdk7-b123
4868a36f6fd8972505c466013813eeb28f0482ea jdk7-b124
4b0560c72b529d4b952924b2da94d8436af79d05 jdk7-b125
438a8ad60f7ae7aa897663148fd43fe85ef05e5b jdk7-b126
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或