[1721] 2008-07-17 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 1721
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1721
Author:   proski
Date:     2008-07-18 03:21:47 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
2008-07-17  Pavel Roskin  <address@hidden>

        * configure.ac: Use -m32 or -m64 regardless of whether we had to
        change target_cpu.  The compiler default can mismatch target_cpu
        in any case.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/configure
    trunk/grub2/configure.ac

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-07-18 01:13:58 UTC (rev 1720)
+++ trunk/grub2/ChangeLog       2008-07-18 03:21:47 UTC (rev 1721)
@@ -1,5 +1,9 @@
 2008-07-17  Pavel Roskin  <address@hidden>
 
+       * configure.ac: Use -m32 or -m64 regardless of whether we had to
+       change target_cpu.  The compiler default can mismatch target_cpu
+       in any case.
+
        * disk/efi/efidisk.c: Fix format warnings on x86_64.
        * kern/efi/efi.c: Likewise.
 

Modified: trunk/grub2/configure
===================================================================
--- trunk/grub2/configure       2008-07-18 01:13:58 UTC (rev 1720)
+++ trunk/grub2/configure       2008-07-18 03:21:47 UTC (rev 1721)
@@ -1962,15 +1962,15 @@
 if test -z "$target_alias"; then
   case "$target_cpu"-"$platform" in
     x86_64-efi) ;;
-    x86_64-*) target_cpu=i386 target_m32=1 ;;
-    powerpc64-ieee1275) target_cpu=powerpc target_m32=1 ;;
+    x86_64-*) target_cpu=i386 ;;
+    powerpc64-ieee1275) target_cpu=powerpc ;;
   esac
 fi
 
 # Check if the platform is supported, make final adjustments.
 case "$target_cpu"-"$platform" in
   i386-efi) ;;
-  x86_64-efi) target_m64=1 ;;
+  x86_64-efi) ;;
   i386-pc) ;;
   i386-coreboot) ;;
   i386-linuxbios) platform=coreboot ;;
@@ -1982,9 +1982,14 @@
    { (exit 1); exit 1; }; } ;;
 esac
 
+case "$target_cpu" in
+  i386 | powerpc) target_m32=1 ;;
+  x86_64 | sparc64) target_m64=1 ;;
+esac
 
 
 
+
 #
 # Checks for build programs.
 #

Modified: trunk/grub2/configure.ac
===================================================================
--- trunk/grub2/configure.ac    2008-07-18 01:13:58 UTC (rev 1720)
+++ trunk/grub2/configure.ac    2008-07-18 03:21:47 UTC (rev 1721)
@@ -76,15 +76,15 @@
 if test -z "$target_alias"; then
   case "$target_cpu"-"$platform" in
     x86_64-efi) ;;
-    x86_64-*) target_cpu=i386 target_m32=1 ;;
-    powerpc64-ieee1275) target_cpu=powerpc target_m32=1 ;;
+    x86_64-*) target_cpu=i386 ;;
+    powerpc64-ieee1275) target_cpu=powerpc ;;
   esac
 fi
 
 # Check if the platform is supported, make final adjustments.
 case "$target_cpu"-"$platform" in
   i386-efi) ;;
-  x86_64-efi) target_m64=1 ;;
+  x86_64-efi) ;;
   i386-pc) ;;
   i386-coreboot) ;;
   i386-linuxbios) platform=coreboot ;;
@@ -94,6 +94,11 @@
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU 
"$target_cpu"]) ;;
 esac
 
+case "$target_cpu" in
+  i386 | powerpc) target_m32=1 ;;
+  x86_64 | sparc64) target_m64=1 ;;
+esac
+
 AC_SUBST(target_cpu)
 AC_SUBST(platform)