Index: mono/mini/mini-amd64.c
===================================================================
--- mono/mini/mini-amd64.c	(revision 149672)
+++ mono/mini/mini-amd64.c	(revision 149673)
@@ -2558,11 +2558,6 @@
 			/* These methods are allocated using malloc */
 			near_call = FALSE;
 
-		if (cfg->compile_aot) {
-			near_call = TRUE;
-			no_patch = TRUE;
-		}
-
 #ifdef MONO_ARCH_NOMAP32BIT
 		near_call = FALSE;
 #endif
@@ -2571,6 +2566,11 @@
 		if (optimize_for_xen)
 			near_call = FALSE;
 
+		if (cfg->compile_aot) {
+			near_call = TRUE;
+			no_patch = TRUE;
+		}
+
 		if (near_call) {
 			/* 
 			 * Align the call displacement to an address divisible by 4 so it does