diff options
| author | Roland McGrath <roland@redhat.com> | 2010-07-26 12:45:17 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2010-11-09 01:45:38 +0100 |
| commit | 5881b3d98138cdcfdc1d816dc1a2b8ec5d84659d (patch) | |
| tree | 47e6737ede0566dc1d4ccdb53c7b01f9e63b0653 | |
| parent | 62724d5f1e48077992e1655c2dc4b5c47c08090e (diff) | |
| download | glibc-5881b3d98138cdcfdc1d816dc1a2b8ec5d84659d.tar.gz glibc-5881b3d98138cdcfdc1d816dc1a2b8ec5d84659d.tar.xz glibc-5881b3d98138cdcfdc1d816dc1a2b8ec5d84659d.zip | |
BZ #11840: Fix config.cache usage for -fgnu89-inline check.
(cherry picked from commit 1c7570ff36595cba9f5797453eda95969a72c56e)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | config.make.in | 2 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 6 |
4 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 867aae4556..5ade17fbdf 100644 --- 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 d65706ceac..afce048154 100644 --- a/config.make.in +++ b/config.make.in @@ -58,7 +58,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 ce76653821..1a3f672ec7 100755 --- a/configure +++ b/configure @@ -681,7 +681,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 @@ -6890,9 +6890,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 182c683e50..7992115417 100644 --- a/configure.in +++ b/configure.in @@ -1776,11 +1776,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, |