Re: [PATCH] New x86_64 EFI patch

["Javier Martín" <lordhabbit@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3508 bytes --]

El jue, 17-07-2008 a las 23:50 +0800, Bean escribió:
> On Thu, Jul 17, 2008 at 11:45 PM, Javier Martín <lordhabbit@gmail.com> wrote:
> > El jue, 17-07-2008 a las 23:26 +0800, Bean escribió:
> >> On Thu, Jul 17, 2008 at 11:22 PM, Pavel Roskin <proski@gnu.org> wrote:
> >> > On Thu, 2008-07-17 at 17:02 +0200, Javier Martín wrote:
> >> >> El jue, 17-07-2008 a las 17:50 +0800, Bean escribió:
> >> >> > Committed.
> >> >> >
> >> >> Seemingly, the fact that there is now separate recognition for "x86_64"
> >> >> machine types has borked the current build system in amd64 PCs:
> >> >>
> >> >> $ make
> >> >> ./config.status --recheck
> >> >> running CONFIG_SHELL=/bin/bash /bin/bash ../src/configure
> >> >> --prefix=/home/javier/Proyectos/grub/build/out/  --no-create
> >> >> --no-recursion
> >> >> checking build system type... x86_64-unknown-linux-gnu
> >> >> checking host system type... x86_64-unknown-linux-gnu
> >> >> checking target system type... x86_64-unknown-linux-gnu
> >> >> configure: error: unsupported machine type
> >> >> make: *** [config.status] Error 1
> >> >
> >> > I've just noticed that.  I think x86_64 should default to "i386-pc"
> >> > platform.  I'll have a look how to do it nicely.
> >>
> >> I have the following in configure.ac:
> >>
> >> if test "x$platform" = "xefi" ; then
> >>   case "$target_cpu" in
> >>     i386) ;;
> >>     x86_64) target_m64=1 ;;
> >>     *) AC_MSG_ERROR([unsupported CPU type for EFI]) ;;
> >>   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
> >>
> >> If platform is not efi, x86_64 will become i386, perhaps there is
> >> something I miss ?
> >>
> >
> > It does not reach that point, the "unsupported machine type" message is
> > thrown by this earlier check (line 59)
> 
> Hi,
> 
> Oh, you're right, use this patch:
> 
> diff --git a/configure.ac b/configure.ac
> index 943b9fe..45eb472 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -61,6 +61,7 @@ if test "x$with_platform" = x; then
>    case "$target_cpu"-"$target_vendor" in
>      i386-apple) platform=efi ;;
>      i386-*) platform=pc ;;
> +    x86_64-*) platform=pc ;;
>      powerpc-*) platform=ieee1275 ;;
>      sparc64-*) platform=ieee1275 ;;
>      *) AC_MSG_ERROR([unsupported machine type]) ;;
> 
> 

I think this one would be better, as it follows the structure what's
done with i386: vendor=apple -> efi; anything_else -> pc. Also, this one
errors out with a more understandable message that does not conflict
with another check some lines down.

Index: configure.ac
===================================================================
--- configure.ac        (revisión: 1714)
+++ configure.ac        (copia de trabajo)
@@ -59,11 +59,11 @@
 # Guess the platform if not specified.
 if test "x$with_platform" = x; then
   case "$target_cpu"-"$target_vendor" in
-    i386-apple) platform=efi ;;
-    i386-*) platform=pc ;;
+    i386-apple|x86_64-apple) platform=efi ;;
+    i386-*|x86_64-*) platform=pc ;;
     powerpc-*) platform=ieee1275 ;;
     sparc64-*) platform=ieee1275 ;;
-    *) AC_MSG_ERROR([unsupported machine type]) ;;
+    *) AC_MSG_ERROR([unable to guess platform. Use --with-platform]) ;;
   esac
 else
   platform="$with_platform"


[-- Attachment #2: Esta parte del mensaje está firmada digitalmente --]
[-- Type: application/pgp-signature, Size: 827 bytes --]