Mercurial > hg > truffle
diff src/cpu/zero/vm/sharedRuntime_zero.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | 89152779163c |
children |
line wrap: on
line diff
--- a/src/cpu/zero/vm/sharedRuntime_zero.cpp Thu Oct 16 10:21:29 2014 +0200 +++ b/src/cpu/zero/vm/sharedRuntime_zero.cpp Wed Oct 15 16:02:50 2014 +0200 @@ -135,6 +135,7 @@ int SharedRuntime::c_calling_convention(const BasicType *sig_bt, VMRegPair *regs, + VMRegPair *regs2, int total_args_passed) { ShouldNotCallThis(); return 0;