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

[Pavel Roskin]

Revision: 1717
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1717
Author:   proski
Date:     2008-07-17 18:13:57 +0000 (Thu, 17 Jul 2008)

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

        * configure.ac: Default to efi platform for x86_64-apple.  Allow
        powerpc64 CPU, default to ieee1275 platform for it.  Split CPU
        adjustments from the rest, only do them if target is not
        explicitly given.  Merge other adjustments with the final sanity
        check.  Remove an extraneous check for supported CPU.  Be
        specific which CPU and which platform is not supported.

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

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-07-17 15:31:16 UTC (rev 1716)
+++ trunk/grub2/ChangeLog       2008-07-17 18:13:57 UTC (rev 1717)
@@ -1,5 +1,12 @@
 2008-07-17  Pavel Roskin  <address@hidden>
 
+       * configure.ac: Default to efi platform for x86_64-apple.  Allow
+       powerpc64 CPU, default to ieee1275 platform for it.  Split CPU
+       adjustments from the rest, only do them if target is not
+       explicitly given.  Merge other adjustments with the final sanity
+       check.  Remove an extraneous check for supported CPU.  Be
+       specific which CPU and which platform is not supported.
+
        * configure.ac: Default to pc platform for x86_64.
 
 2008-07-17  Robert Millan  <address@hidden>

Modified: trunk/grub2/configure
===================================================================
--- trunk/grub2/configure       2008-07-17 15:31:16 UTC (rev 1716)
+++ trunk/grub2/configure       2008-07-17 18:13:57 UTC (rev 1717)
@@ -1945,53 +1945,40 @@
   case "$target_cpu"-"$target_vendor" in
     i386-apple) platform=efi ;;
     i386-*) platform=pc ;;
+    x86_64-apple) platform=efi ;;
     x86_64-*) platform=pc ;;
     powerpc-*) platform=ieee1275 ;;
+    powerpc64-*) platform=ieee1275 ;;
     sparc64-*) platform=ieee1275 ;;
-    *) { { echo "$as_me:$LINENO: error: unsupported machine type" >&5
-echo "$as_me: error: unsupported machine type" >&2;}
+    *) { { echo "$as_me:$LINENO: error: unsupported CPU: \"$target_cpu\"" >&5
+echo "$as_me: error: unsupported CPU: \"$target_cpu\"" >&2;}
    { (exit 1); exit 1; }; } ;;
   esac
 else
   platform="$with_platform"
 fi
 
-case "$platform" in
-  linuxbios) platform=coreboot ;;
-esac
-
-if test "x$platform" = "xefi" ; then
-  case "$target_cpu" in
-    i386) ;;
-    x86_64) target_m64=1 ;;
-    *) { { echo "$as_me:$LINENO: error: unsupported CPU type for EFI" >&5
-echo "$as_me: error: unsupported CPU type for EFI" >&2;}
-   { (exit 1); exit 1; }; } ;;
+# Adjust CPU unless target was explicitly specified.
+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 ;;
   esac
-else
-  case "$target_cpu" in
-    i386) ;;
-    x86_64) target_cpu=i386 target_m32=1 ;;
-    powerpc) ;;
-    powerpc64) target_cpu=powerpc target_m32=1;;
-    sparc64) ;;
-    *) { { echo "$as_me:$LINENO: error: unsupported CPU type" >&5
-echo "$as_me: error: unsupported CPU type" >&2;}
-   { (exit 1); exit 1; }; } ;;
-  esac
 fi
 
-# Sanity check.
+# Check if the platform is supported, make final adjustments.
 case "$target_cpu"-"$platform" in
   i386-efi) ;;
-  x86_64-efi) ;;
+  x86_64-efi) target_m64=1 ;;
   i386-pc) ;;
   i386-coreboot) ;;
+  i386-linuxbios) platform=coreboot ;;
   i386-ieee1275) ;;
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
-  *) { { echo "$as_me:$LINENO: error: unsupported machine type" >&5
-echo "$as_me: error: unsupported machine type" >&2;}
+  *) { { echo "$as_me:$LINENO: error: platform \"$platform\" is not supported 
for target CPU \"$target_cpu\"" >&5
+echo "$as_me: error: platform \"$platform\" is not supported for target CPU 
\"$target_cpu\"" >&2;}
    { (exit 1); exit 1; }; } ;;
 esac
 

Modified: trunk/grub2/configure.ac
===================================================================
--- trunk/grub2/configure.ac    2008-07-17 15:31:16 UTC (rev 1716)
+++ trunk/grub2/configure.ac    2008-07-17 18:13:57 UTC (rev 1717)
@@ -61,46 +61,37 @@
   case "$target_cpu"-"$target_vendor" in
     i386-apple) platform=efi ;;
     i386-*) platform=pc ;;
+    x86_64-apple) platform=efi ;;
     x86_64-*) platform=pc ;;
     powerpc-*) platform=ieee1275 ;;
+    powerpc64-*) platform=ieee1275 ;;
     sparc64-*) platform=ieee1275 ;;
-    *) AC_MSG_ERROR([unsupported machine type]) ;;
+    *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
   esac
 else
   platform="$with_platform"
 fi
 
-case "$platform" in
-  linuxbios) platform=coreboot ;;
-esac
-
-if test "x$platform" = "xefi" ; then
-  case "$target_cpu" in
-    i386) ;;
-    x86_64) target_m64=1 ;;
-    *) AC_MSG_ERROR([unsupported CPU type for EFI]) ;;
+# Adjust CPU unless target was explicitly specified.
+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 ;;
   esac
-else
-  case "$target_cpu" in
-    i386) ;;
-    x86_64) target_cpu=i386 target_m32=1 ;;
-    powerpc) ;;
-    powerpc64) target_cpu=powerpc target_m32=1;;
-    sparc64) ;;
-    *) AC_MSG_ERROR([unsupported CPU type]) ;;
-  esac
 fi
 
-# Sanity check.
+# Check if the platform is supported, make final adjustments.
 case "$target_cpu"-"$platform" in
   i386-efi) ;;
-  x86_64-efi) ;;
+  x86_64-efi) target_m64=1 ;;
   i386-pc) ;;
   i386-coreboot) ;;
+  i386-linuxbios) platform=coreboot ;;
   i386-ieee1275) ;;
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
-  *) AC_MSG_ERROR([unsupported machine type]) ;;
+  *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU 
"$target_cpu"]) ;;
 esac
 
 AC_SUBST(target_cpu)