--- old/src/cpu/x86/vm/macroAssembler_x86.cpp	2015-10-13 12:25:20.596637631 +0200
+++ new/src/cpu/x86/vm/macroAssembler_x86.cpp	2015-10-13 12:25:20.456637625 +0200
@@ -6247,7 +6247,9 @@
     // Save caller's stack pointer into RBP if the frame pointer is preserved.
     if (PreserveFramePointer) {
       movptr(rbp, rsp);
-      addptr(rbp, framesize + wordSize);
+      if (framesize > 0) {
+        addptr(rbp, framesize);
+      }
     }
   }