# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1381932940 -7200
# Node ID d60cdea439206d65600e506610a4089cc68da1a2
# Parent  aace760df495bf05fd5e325c7700d1d9ba04f051# Parent  bef1738b58d94c514ad8292b996edba88e7e6abf
Merge.

diff -r aace760df495 -r d60cdea43920 mxtool/mx.py
--- 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]
diff -r aace760df495 -r d60cdea43920 src/cpu/x86/vm/templateInterpreter_x86.hpp
--- 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