From: Roland McGrath Date: Fri, 2 Jul 2004 06:45:08 +0000 (+0000) Subject: 2004-07-01 Roland McGrath X-Git-Tag: cvs/fedora-base~353 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffbbbee18e9d3401e1916394428b31f2928b2926;p=thirdparty%2Fglibc.git 2004-07-01 Roland McGrath * sysdeps/unix/sysv/linux/configure.in: If arch_minimum_kernel was already set, don't set it or libc_cv_gcc_unwind_find_fde. * sysdeps/unix/sysv/linux/configure: Regenerated. --- diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 7d7d2d1c7ad..89484200ce6 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -87,7 +87,11 @@ fi # If the user gave a minimal version number test whether the available # kernel headers are young enough. Additionally we have minimal -# kernel versions for some architectures. +# kernel versions for some architectures. If a previous configure fragment +# set arch_minimum_kernel already, let that override our defaults here. +# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde +# if appropriate too. +test -n "$arch_minimum_kernel" || case "$machine" in alpha*) arch_minimum_kernel=2.1.100 diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 818a59d2e49..f0a7fb12313 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -46,7 +46,11 @@ fi # If the user gave a minimal version number test whether the available # kernel headers are young enough. Additionally we have minimal -# kernel versions for some architectures. +# kernel versions for some architectures. If a previous configure fragment +# set arch_minimum_kernel already, let that override our defaults here. +# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde +# if appropriate too. +test -n "$arch_minimum_kernel" || case "$machine" in alpha*) arch_minimum_kernel=2.1.100