vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2008-07-17 Pavel Roskin <proski@gnu.org> 

* 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.
This commit is contained in:
proski 2008-07-17 18:13:57 +00:00
parent 737feb3579
commit 58393a2d35
3 changed files with 35 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2008-07-17 Pavel Roskin <proski@gnu.org>
* 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 <rmh@aybabtu.com>

43
configure vendored
View File

@ -1945,53 +1945,40 @@ if test "x$with_platform" = x; then
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; }; } ;;
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; }; } ;;
# 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
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

35
configure.ac
View File

@ -61,46 +61,37 @@ if test "x$with_platform" = x; then
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]) ;;
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]) ;;
# 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
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)