BZ #11840: Fix config.cache usage for -fgnu89-inline check.

(cherry picked from commit 1c7570ff36595cba9f5797453eda95969a72c56e)

diff --git a/ChangeLog b/ChangeLog
index 87ff5c6ba70015de5a1d0b702fd2a2f1ff7522e7..87da49d9dd1238288c716894284962706d005264 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-26  Roland McGrath  <roland@redhat.com>
+
+       [BZ #11840]
+       * configure.in (-fgnu89-inline check): Set and substitute
+       gnu89_inline, not libc_cv_gnu89_inline.
+       * configure: Regenerated.
+       * config.make.in (gnu89-inline-CFLAGS): Use @gnu89_inline@.
+
 2010-07-20  Roland McGrath  <roland@redhat.com>
 
        * elf/dl-sysdep.c (_dl_important_hwcaps): Add dsocaps mask to

diff --git a/config.make.in b/config.make.in
index adfda9d9a43d2168a7edce5d4fbbbe3b6de4f68c..efffee4bb7ae4eefa0dcf23bfd84046116b10630 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -59,7 +59,7 @@ have-cpp-asm-debuginfo = @libc_cv_cpp_asm_debuginfo@
 enable-check-abi = @enable_check_abi@
 have-forced-unwind = @libc_cv_forced_unwind@
 have-fpie = @libc_cv_fpie@
-gnu89-inline-CFLAGS = @libc_cv_gnu89_inline@
+gnu89-inline-CFLAGS = @gnu89_inline@
 have-ssp = @libc_cv_ssp@
 have-selinux = @have_selinux@
 have-libaudit = @have_libaudit@

diff --git a/configure b/configure
index b6752d147c6b41645d30e63e6f9f2ee2d09d47ee..2af27a5db6227c397772cb5e85668ebbada0bece 100755 (executable)
--- a/configure
+++ b/configure
@@ -682,7 +682,7 @@ libc_cv_cc_submachine
 exceptions
 no_whole_archive
 libc_cv_have_initfini
-libc_cv_gnu89_inline
+gnu89_inline
 libc_cv_ssp
 fno_unit_at_a_time
 libc_cv_hashstyle
@@ -6924,9 +6924,9 @@ fi
 { $as_echo "$as_me:$LINENO: result: $libc_cv_gnu89_inline" >&5
 $as_echo "$libc_cv_gnu89_inline" >&6; }
 if test $libc_cv_gnu89_inline = yes; then
-  libc_cv_gnu89_inline=-fgnu89-inline
+  gnu89_inline=-fgnu89-inline
 else
-  libc_cv_gnu89_inline=
+  gnu89_inline=
 fi
 
 

diff --git a/configure.in b/configure.in
index 56849dfc489af06bac12ccfa70a867877f13dda3..036a950d8f5fa0cd586e8ee686b58407519bde85 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1803,11 +1803,11 @@ else
 fi
 rm -f conftest*])
 if test $libc_cv_gnu89_inline = yes; then
-  libc_cv_gnu89_inline=-fgnu89-inline
+  gnu89_inline=-fgnu89-inline
 else
-  libc_cv_gnu89_inline=
+  gnu89_inline=
 fi
-AC_SUBST(libc_cv_gnu89_inline)
+AC_SUBST(gnu89_inline)
 
 if test $elf != yes; then
   AC_CACHE_CHECK(for .init and .fini sections, libc_cv_have_initfini,