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

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

Browse source 
* 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:
proski 2008-07-18 03:21:47 +00:00
parent c11f6d160d
commit 3f4ce737bb
3 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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.

11
configure vendored
View file

@ -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

11
configure.ac
View file

@ -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)