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

2008-04-10 Pavel Roskin <proski@gnu.org>

Browse source 
* configure.ac: Always use "_cv_" in cache variables for
	compatibility with Autoconf 2.62.
This commit is contained in:
proski 2008-04-10 22:26:50 +00:00
parent a02a73c5f8
commit 322562eae8
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-04-10 Pavel Roskin <proski@gnu.org>
* configure.ac: Always use "_cv_" in cache variables for
compatibility with Autoconf 2.62.
2008-04-07 Robert Millan <rmh@aybabtu.com> 2008-04-07 Robert Millan <rmh@aybabtu.com>
Revert grub/machine/init.h addition by Pavel (since it breaks on Revert grub/machine/init.h addition by Pavel (since it breaks on

24
configure vendored
View file

@ -6561,7 +6561,7 @@ if test "x$TARGET_CFLAGS" = x; then
# optimization flags. # optimization flags.
{ echo "$as_me:$LINENO: checking whether optimization for size works" >&5 { echo "$as_me:$LINENO: checking whether optimization for size works" >&5
echo $ECHO_N "checking whether optimization for size works... $ECHO_C" >&6; } echo $ECHO_N "checking whether optimization for size works... $ECHO_C" >&6; }
if test "${size_flag+set}" = set; then if test "${grub_cv_cc_Os+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
@ -6598,20 +6598,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" || test -z "$ac_c_werror_flag" ||
test ! -s conftest.err test ! -s conftest.err
} && test -s conftest.$ac_objext; then } && test -s conftest.$ac_objext; then
size_flag=yes grub_cv_cc_Os=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
size_flag=no grub_cv_cc_Os=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
{ echo "$as_me:$LINENO: result: $size_flag" >&5 { echo "$as_me:$LINENO: result: $grub_cv_cc_Os" >&5
echo "${ECHO_T}$size_flag" >&6; } echo "${ECHO_T}$grub_cv_cc_Os" >&6; }
if test "x$size_flag" = xyes; then if test "x$grub_cv_cc_Os" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -Os" TARGET_CFLAGS="$TARGET_CFLAGS -Os"
else else
TARGET_CFLAGS="$TARGET_CFLAGS -O2 -fno-strength-reduce -fno-unroll-loops" TARGET_CFLAGS="$TARGET_CFLAGS -O2 -fno-strength-reduce -fno-unroll-loops"
@ -6621,7 +6621,7 @@ echo "${ECHO_T}$size_flag" >&6; }
if test "x$target_cpu" = xi386; then if test "x$target_cpu" = xi386; then
{ echo "$as_me:$LINENO: checking whether -falign-loops works" >&5 { echo "$as_me:$LINENO: checking whether -falign-loops works" >&5
echo $ECHO_N "checking whether -falign-loops works... $ECHO_C" >&6; } echo $ECHO_N "checking whether -falign-loops works... $ECHO_C" >&6; }
if test "${falign_loop_flag+set}" = set; then if test "${grub_cv_cc_falign_loop+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
@ -6658,21 +6658,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test -z "$ac_c_werror_flag" || test -z "$ac_c_werror_flag" ||
test ! -s conftest.err test ! -s conftest.err
} && test -s conftest.$ac_objext; then } && test -s conftest.$ac_objext; then
falign_loop_flag=yes grub_cv_cc_falign_loop=yes
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
falign_loop_flag=no grub_cv_cc_falign_loop=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
{ echo "$as_me:$LINENO: result: $falign_loop_flag" >&5 { echo "$as_me:$LINENO: result: $grub_cv_cc_falign_loop" >&5
echo "${ECHO_T}$falign_loop_flag" >&6; } echo "${ECHO_T}$grub_cv_cc_falign_loop" >&6; }
if test "x$falign_loop_flag" = xyes; then if test "x$grub_cv_cc_falign_loop" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1" TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
else else
TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1" TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"

12
configure.ac
View file

@ -207,11 +207,11 @@ if test "x$TARGET_CFLAGS" = x; then
-Wundef -Wstrict-prototypes -g" -Wundef -Wstrict-prototypes -g"
# optimization flags. # optimization flags.
AC_CACHE_CHECK([whether optimization for size works], size_flag, [ AC_CACHE_CHECK([whether optimization for size works], grub_cv_cc_Os, [
CFLAGS=-Os CFLAGS=-Os
AC_TRY_COMPILE(, , size_flag=yes, size_flag=no) AC_TRY_COMPILE(, , grub_cv_cc_Os=yes, grub_cv_cc_Os=no)
]) ])
if test "x$size_flag" = xyes; then if test "x$grub_cv_cc_Os" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -Os" TARGET_CFLAGS="$TARGET_CFLAGS -Os"
else else
TARGET_CFLAGS="$TARGET_CFLAGS -O2 -fno-strength-reduce -fno-unroll-loops" TARGET_CFLAGS="$TARGET_CFLAGS -O2 -fno-strength-reduce -fno-unroll-loops"
@ -219,12 +219,12 @@ if test "x$TARGET_CFLAGS" = x; then
# Force no alignment to save space on i386. # Force no alignment to save space on i386.
if test "x$target_cpu" = xi386; then if test "x$target_cpu" = xi386; then
AC_CACHE_CHECK([whether -falign-loops works], [falign_loop_flag], [ AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
CFLAGS="-falign-loops=1" CFLAGS="-falign-loops=1"
AC_TRY_COMPILE(, , [falign_loop_flag=yes], [falign_loop_flag=no]) AC_TRY_COMPILE(, , [grub_cv_cc_falign_loop=yes], [grub_cv_cc_falign_loop=no])
]) ])
if test "x$falign_loop_flag" = xyes; then if test "x$grub_cv_cc_falign_loop" = xyes; then
TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1" TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
else else
TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1" TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"