lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Improve consistency of --enable-kernel and default builds.

Browse Source
This commit is contained in:
Joseph Myers
2012-05-14 22:22:52 +00:00
parent 11de3a3371
commit 37f1abd46c
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2012-05-14 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/dl-machine.h (elf_machine_load_address): Remove * sysdeps/x86_64/dl-machine.h (elf_machine_load_address): Remove

4
sysdeps/unix/sysv/linux/configure vendored
View File

@ -331,12 +331,9 @@ $as_echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel"
minimum_kernel=$arch_minimum_kernel minimum_kernel=$arch_minimum_kernel
fi fi
else else
if test $arch_minimum_kernel != '2.2.0'; then
minimum_kernel=$arch_minimum_kernel minimum_kernel=$arch_minimum_kernel
fi fi
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; } $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)/'`; decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
@ -371,7 +368,6 @@ _ACEOF
as_fn_error $? "*** The available kernel headers are older than the requested as_fn_error $? "*** The available kernel headers are older than the requested
*** compatible kernel version" "$LINENO" 5 *** compatible kernel version" "$LINENO" 5
fi fi
fi
# The result of the above test for the use of the FDE code is invalid if # The result of the above test for the use of the FDE code is invalid if
# the user overrides the decision about the minimum ABI. # the user overrides the decision about the minimum ABI.

4
sysdeps/unix/sysv/linux/configure.in
View File

@ -87,12 +87,9 @@ if test -n "$minimum_kernel"; then
minimum_kernel=$arch_minimum_kernel minimum_kernel=$arch_minimum_kernel
fi fi
else else
if test $arch_minimum_kernel != '2.2.0'; then
minimum_kernel=$arch_minimum_kernel minimum_kernel=$arch_minimum_kernel
fi fi
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 changequote(,)dnl
decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`; decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
@ -110,7 +107,6 @@ eat flaming death
AC_MSG_ERROR([*** The available kernel headers are older than the requested AC_MSG_ERROR([*** The available kernel headers are older than the requested
*** compatible kernel version]) *** compatible kernel version])
fi fi
fi
# The result of the above test for the use of the FDE code is invalid if # The result of the above test for the use of the FDE code is invalid if
# the user overrides the decision about the minimum ABI. # the user overrides the decision about the minimum ABI.