diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 26 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 26 |
3 files changed, 28 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog index 7c487bd6a9..301bcfb7a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-14 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/unix/sysv/linux/configure.in (minimum_kernel): Always + set if not set by the user. Do not allow for being unset. + * sysdeps/unix/sysv/linux/configure: Regenerated. + 2012-05-14 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/x86_64/dl-machine.h (elf_machine_load_address): Remove diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 8235068a18..fe61c111be 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -331,17 +331,14 @@ $as_echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel" minimum_kernel=$arch_minimum_kernel fi else - if test $arch_minimum_kernel != '2.2.0'; then - minimum_kernel=$arch_minimum_kernel - fi + minimum_kernel=$arch_minimum_kernel fi -if test -n "$minimum_kernel"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel header at least $minimum_kernel" >&5 $as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; } - decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; - abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <linux/version.h> #if LINUX_VERSION_CODE < $decnum @@ -356,21 +353,20 @@ else fi rm -f conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_minimum_kernel" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_minimum_kernel" >&5 $as_echo "$libc_minimum_kernel" >&6; } - if test "$libc_minimum_kernel" = ok; then - cat >>confdefs.h <<_ACEOF +if test "$libc_minimum_kernel" = ok; then + cat >>confdefs.h <<_ACEOF #define __LINUX_KERNEL_VERSION $decnum _ACEOF - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <<_ACEOF #define __ABI_TAG_VERSION $abinum _ACEOF - else - as_fn_error $? "*** The available kernel headers are older than the requested +else + as_fn_error $? "*** The available kernel headers are older than the requested *** compatible kernel version" "$LINENO" 5 - fi fi # The result of the above test for the use of the FDE code is invalid if diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 1ce14f294f..72fbe8422b 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -87,29 +87,25 @@ if test -n "$minimum_kernel"; then minimum_kernel=$arch_minimum_kernel fi else - if test $arch_minimum_kernel != '2.2.0'; then - minimum_kernel=$arch_minimum_kernel - fi + minimum_kernel=$arch_minimum_kernel fi -if test -n "$minimum_kernel"; then - AC_MSG_CHECKING(for kernel header at least $minimum_kernel) +AC_MSG_CHECKING(for kernel header at least $minimum_kernel) changequote(,)dnl - decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; - abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; +decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; +abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`; changequote([,])dnl - AC_EGREP_CPP([eat flaming death], [#include <linux/version.h> +AC_EGREP_CPP([eat flaming death], [#include <linux/version.h> #if LINUX_VERSION_CODE < $decnum eat flaming death #endif], libc_minimum_kernel='too old!', libc_minimum_kernel=ok) - AC_MSG_RESULT($libc_minimum_kernel) - if test "$libc_minimum_kernel" = ok; then - AC_DEFINE_UNQUOTED(__LINUX_KERNEL_VERSION, $decnum) - AC_DEFINE_UNQUOTED(__ABI_TAG_VERSION, $abinum) - else - AC_MSG_ERROR([*** The available kernel headers are older than the requested +AC_MSG_RESULT($libc_minimum_kernel) +if test "$libc_minimum_kernel" = ok; then + AC_DEFINE_UNQUOTED(__LINUX_KERNEL_VERSION, $decnum) + AC_DEFINE_UNQUOTED(__ABI_TAG_VERSION, $abinum) +else + AC_MSG_ERROR([*** The available kernel headers are older than the requested *** compatible kernel version]) - fi fi # The result of the above test for the use of the FDE code is invalid if |