* configure.ac: Use -mcmodel=large on x86_64-emu as well.

	Reported by: qwertial.

diff --git a/ChangeLog b/ChangeLog
index 0e6d38a68588697ae3de03a2eab907adfa12a805..0485a01f105771fd66905662d33023a23346ab43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * configure.ac: Use -mcmodel=large on x86_64-emu as well.
+       Reported by: qwertial.
+
 2013-04-29  Vladimir Testov <vladimir.testov@rosalab.ru>
 
        * grub-core/gfxmenu/circular_progress.c: Set start_angle in degrees

diff --git a/configure.ac b/configure.ac
index 5ff7f25ac4e6cb846ac7ef9327c9ad56ead72726..00540e6be1438eb3a2599f10a32c65833ca3d322 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -605,7 +605,7 @@ if test "x$target_m64" = x1; then
   TARGET_MODULE_FORMAT="elf64"
 fi
 
-if test "$target_cpu"-"$platform" = x86_64-efi; then
+if test "$target_cpu" = x86_64; then
   # Use large model to support 4G memory
   AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
     SAVED_CFLAGS=$CFLAGS
@@ -619,7 +619,9 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then
   else
     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
   fi
+fi
 
+if test "$target_cpu"-"$platform" = x86_64-efi; then
   # EFI writes to stack below %rsp, we must not use the red zone
   AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
     CFLAGS="$CFLAGS -m64 -mno-red-zone"