# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1380206787 -7200
# Node ID 22d47c2c74e99e1b7d80bf958aa3f306f6c58cdd
# Parent  14904566a4b21e5c3dae8fb4ddaea5a67a7a7cfa# Parent  9af8b109ec0fca3478403a4d908eeb880174e53e
Merge

diff -r 9af8b109ec0f -r 22d47c2c74e9 src/cpu/x86/vm/globals_x86.hpp
--- a/src/cpu/x86/vm/globals_x86.hpp	Thu Sep 26 16:44:54 2013 +0200
+++ b/src/cpu/x86/vm/globals_x86.hpp	Thu Sep 26 16:46:27 2013 +0200
@@ -46,7 +46,7 @@
 // the the vep is aligned at CodeEntryAlignment whereas c2 only aligns
 // the uep and the vep doesn't get real alignment but just slops on by
 // only assured that the entry instruction meets the 5 byte size requirement.
-#ifdef COMPILER2
+#if defined(COMPILER2) || defined(GRAAL)
 define_pd_global(intx, CodeEntryAlignment,       32);
 #else
 define_pd_global(intx, CodeEntryAlignment,       16);