mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-27 09:39:22 +00:00
2008-07-17 Pavel Roskin <proski@gnu.org>
* 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.
This commit is contained in:
1 parent
c11f6d160d
commit
3f4ce737bb
3 files changed
+20
-6
No files matched your search
@@ -1,5 +1,9 @@
|
||||
2008-07-17 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* 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.
|
||||
|
||||
|
||||
@@ -1962,15 +1962,15 @@ fi
|
||||
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,6 +1982,11 @@ echo "$as_me: error: platform \"$platform\" is not supported for target CPU \"$t
|
||||
{ (exit 1); exit 1; }; } ;;
|
||||
esac
|
||||
|
||||
case "$target_cpu" in
|
||||
i386 | powerpc) target_m32=1 ;;
|
||||
x86_64 | sparc64) target_m64=1 ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+8
-3
@@ -76,15 +76,15 @@ fi
|
||||
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 @@ case "$target_cpu"-"$platform" in
|
||||
*) 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)
|
||||
|
||||
|
||||
Reference in new issue
Block a user