Mercurial > hg > truffle
changeset 12451:d60cdea43920
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Wed, 16 Oct 2013 16:15:40 +0200 |
| parents | aace760df495 (current diff) bef1738b58d9 (diff) |
| children | ce4836e0212d f1b7b7d2dad5 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mxtool/mx.py Wed Oct 16 15:03:29 2013 +0200 +++ b/mxtool/mx.py Wed Oct 16 16:15:40 2013 +0200 @@ -2675,7 +2675,8 @@ if _isAnnotationProcessorDependency(p): _genEclipseBuilder(out, p, 'Jar.launch', 'archive ' + p.name, refresh=False, async=False, xmlIndent='', xmlStandalone='no') - _genEclipseBuilder(out, p, 'Refresh.launch', '', refresh=True, async=True) + # Refresh.launch seems to cause occasional build looping in Eclipse + # _genEclipseBuilder(out, p, 'Refresh.launch', '', refresh=True, async=True) if projToDist.has_key(p.name): dist, distDeps = projToDist[p.name]
--- a/src/cpu/x86/vm/templateInterpreter_x86.hpp Wed Oct 16 15:03:29 2013 +0200 +++ b/src/cpu/x86/vm/templateInterpreter_x86.hpp Wed Oct 16 16:15:40 2013 +0200 @@ -34,7 +34,7 @@ // Run with +PrintInterpreter to get the VM to print out the size. // Max size with JVMTI #ifdef AMD64 - const static int InterpreterCodeSize = GRAALVM_ONLY(244) NOT_GRAALVM(240) * 1024; + const static int InterpreterCodeSize = GRAAL_ONLY(256) NOT_GRAAL(208) * 1024; #else const static int InterpreterCodeSize = 176 * 1024; #endif // AMD64