mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08:00
0ea5d373c7
Continuing the process of making non-ex-ports architectures follow the preferred sysdeps practices followed by ex-ports architectures - that is, putting things in architecture-specific sysdeps files rather than having architecture-specific cases in architecture-independent files - this patch moves architecture cases out of sysdeps/unix/sysv/linux/configure.ac into (new or existing) configure fragments for each architecture. (In the case of the arch_minimum_kernel setting for x32, sysdeps/unix/sysv/linux/x86_64/x32/configure already has such a setting so the setting in sysdeps/unix/sysv/linux/configure.ac was a duplicate that could just be removed - though I haven't tested for x32.) Tested for x86_64 and x86 that the patch causes no changes to the installed shared libraries or ldd (or any part of the installation except for the parts that always change because the files contain timestamps - nscd and static libraries). * sysdeps/unix/sysv/linux/configure.ac: Remove cases for individual architectures. * sysdeps/unix/sysv/linux/configure: Regenerated. * sysdeps/unix/sysv/linux/i386/configure.ac: New file. * sysdeps/unix/sysv/linux/i386/configure: New generated file. * sysdeps/unix/sysv/linux/powerpc/configure.ac (ldd_rewrite_script): Define variable. * sysdeps/unix/sysv/linux/powerpc/configure: Regenerated. * sysdeps/unix/sysv/linux/powerpc/powerpc32/configure.ac: New file. * sysdeps/unix/sysv/linux/powerpc/powerpc32/configure: New generated file. * sysdeps/unix/sysv/linux/s390/configure.ac: New file. * sysdeps/unix/sysv/linux/s390/configure: New generated file. * sysdeps/unix/sysv/linux/sh/configure.ac: New file. * sysdeps/unix/sysv/linux/sh/configure: New generated file. * sysdeps/unix/sysv/linux/sparc/configure.ac: New file. * sysdeps/unix/sysv/linux/sparc/configure: New generated file. * sysdeps/unix/sysv/linux/x86_64/configure.ac: New file. * sysdeps/unix/sysv/linux/x86_64/configure: New generated file.
363 lines
12 KiB
Plaintext
363 lines
12 KiB
Plaintext
|
|
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
|
|
# -------------------------------------------------------
|
|
# Tests whether HEADER exists and can be compiled using the include files in
|
|
# INCLUDES, setting the cache variable VAR accordingly.
|
|
ac_fn_c_check_header_compile ()
|
|
{
|
|
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
|
|
$as_echo_n "checking for $2... " >&6; }
|
|
if eval \${$3+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
$4
|
|
#include <$2>
|
|
_ACEOF
|
|
if ac_fn_c_try_compile "$LINENO"; then :
|
|
eval "$3=yes"
|
|
else
|
|
eval "$3=no"
|
|
fi
|
|
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
fi
|
|
eval ac_res=\$$3
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
|
$as_echo "$ac_res" >&6; }
|
|
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
|
|
|
} # ac_fn_c_check_header_compile
|
|
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
|
|
# Local configure fragment for sysdeps/unix/sysv/linux.
|
|
|
|
if test -n "$sysheaders"; then
|
|
OLD_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
|
|
fi
|
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
|
|
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
|
|
if ${ac_cv_path_GREP+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if test -z "$GREP"; then
|
|
ac_path_GREP_found=false
|
|
# Loop through the user's path and test for each of PROGNAME-LIST
|
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_prog in grep ggrep; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
|
|
# Check for GNU ac_path_GREP and select it if it is found.
|
|
# Check for GNU $ac_path_GREP
|
|
case `"$ac_path_GREP" --version 2>&1` in
|
|
*GNU*)
|
|
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
|
|
*)
|
|
ac_count=0
|
|
$as_echo_n 0123456789 >"conftest.in"
|
|
while :
|
|
do
|
|
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
mv "conftest.tmp" "conftest.in"
|
|
cp "conftest.in" "conftest.nl"
|
|
$as_echo 'GREP' >> "conftest.nl"
|
|
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
if test $ac_count -gt ${ac_path_GREP_max-0}; then
|
|
# Best one so far, save it but keep looking for a better one
|
|
ac_cv_path_GREP="$ac_path_GREP"
|
|
ac_path_GREP_max=$ac_count
|
|
fi
|
|
# 10*(2^10) chars as input seems more than enough
|
|
test $ac_count -gt 10 && break
|
|
done
|
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
esac
|
|
|
|
$ac_path_GREP_found && break 3
|
|
done
|
|
done
|
|
done
|
|
IFS=$as_save_IFS
|
|
if test -z "$ac_cv_path_GREP"; then
|
|
as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
fi
|
|
else
|
|
ac_cv_path_GREP=$GREP
|
|
fi
|
|
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
|
|
$as_echo "$ac_cv_path_GREP" >&6; }
|
|
GREP="$ac_cv_path_GREP"
|
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
|
|
$as_echo_n "checking for egrep... " >&6; }
|
|
if ${ac_cv_path_EGREP+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
|
|
then ac_cv_path_EGREP="$GREP -E"
|
|
else
|
|
if test -z "$EGREP"; then
|
|
ac_path_EGREP_found=false
|
|
# Loop through the user's path and test for each of PROGNAME-LIST
|
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
|
|
do
|
|
IFS=$as_save_IFS
|
|
test -z "$as_dir" && as_dir=.
|
|
for ac_prog in egrep; do
|
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
|
|
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
|
|
# Check for GNU ac_path_EGREP and select it if it is found.
|
|
# Check for GNU $ac_path_EGREP
|
|
case `"$ac_path_EGREP" --version 2>&1` in
|
|
*GNU*)
|
|
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
|
|
*)
|
|
ac_count=0
|
|
$as_echo_n 0123456789 >"conftest.in"
|
|
while :
|
|
do
|
|
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
|
mv "conftest.tmp" "conftest.in"
|
|
cp "conftest.in" "conftest.nl"
|
|
$as_echo 'EGREP' >> "conftest.nl"
|
|
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
|
as_fn_arith $ac_count + 1 && ac_count=$as_val
|
|
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
|
|
# Best one so far, save it but keep looking for a better one
|
|
ac_cv_path_EGREP="$ac_path_EGREP"
|
|
ac_path_EGREP_max=$ac_count
|
|
fi
|
|
# 10*(2^10) chars as input seems more than enough
|
|
test $ac_count -gt 10 && break
|
|
done
|
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
|
esac
|
|
|
|
$ac_path_EGREP_found && break 3
|
|
done
|
|
done
|
|
done
|
|
IFS=$as_save_IFS
|
|
if test -z "$ac_cv_path_EGREP"; then
|
|
as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
|
|
fi
|
|
else
|
|
ac_cv_path_EGREP=$EGREP
|
|
fi
|
|
|
|
fi
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
|
|
$as_echo "$ac_cv_path_EGREP" >&6; }
|
|
EGREP="$ac_cv_path_EGREP"
|
|
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking installed Linux kernel header files" >&5
|
|
$as_echo_n "checking installed Linux kernel header files... " >&6; }
|
|
if ${libc_cv_linux2632+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
#include <linux/version.h>
|
|
#if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (2 *65536+ 6 *256+ 32) /* 2.6.32 */
|
|
eat flaming death
|
|
#endif
|
|
_ACEOF
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
$EGREP "eat flaming death" >/dev/null 2>&1; then :
|
|
libc_cv_linux2632='TOO OLD!'
|
|
else
|
|
libc_cv_linux2632='2.6.32 or later'
|
|
fi
|
|
rm -f conftest*
|
|
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_linux2632" >&5
|
|
$as_echo "$libc_cv_linux2632" >&6; }
|
|
if test "$libc_cv_linux2632" != '2.6.32 or later'; then
|
|
as_fn_error $? "GNU libc requires kernel header files from
|
|
Linux 2.6.32 or later to be installed before configuring.
|
|
The kernel header files are found usually in /usr/include/asm and
|
|
/usr/include/linux; make sure these directories use files from
|
|
Linux 2.6.32 or later. This check uses <linux/version.h>, so
|
|
make sure that file was built correctly when installing the kernel header
|
|
files. To use kernel headers not from /usr/include/linux, use the
|
|
configure option --with-headers." "$LINENO" 5
|
|
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. 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" || arch_minimum_kernel=2.6.32
|
|
if test -n "$minimum_kernel"; then
|
|
|
|
user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
|
|
arch_version=$((`echo "$arch_minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
|
|
|
|
if test $user_version -lt $arch_version; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&5
|
|
$as_echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&2;}
|
|
minimum_kernel=$arch_minimum_kernel
|
|
fi
|
|
else
|
|
minimum_kernel=$arch_minimum_kernel
|
|
fi
|
|
|
|
{ $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
|
|
/* end confdefs.h. */
|
|
#include <linux/version.h>
|
|
#if LINUX_VERSION_CODE < $decnum
|
|
eat flaming death
|
|
#endif
|
|
_ACEOF
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
$EGREP "eat flaming death" >/dev/null 2>&1; then :
|
|
libc_minimum_kernel='too old!'
|
|
else
|
|
libc_minimum_kernel=ok
|
|
fi
|
|
rm -f conftest*
|
|
|
|
{ $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
|
|
#define __LINUX_KERNEL_VERSION $decnum
|
|
_ACEOF
|
|
|
|
cat >>confdefs.h <<_ACEOF
|
|
#define __ABI_TAG_VERSION $abinum
|
|
_ACEOF
|
|
|
|
else
|
|
as_fn_error $? "*** The available kernel headers are older than the requested
|
|
*** compatible kernel version" "$LINENO" 5
|
|
fi
|
|
|
|
# Until we start requiring 2.6.37+ headers, we need to check for the
|
|
# availability of linux/fanotify.h for testing purposes.
|
|
ac_fn_c_check_header_compile "$LINENO" "linux/fanotify.h" "ac_cv_header_linux_fanotify_h" "/* No default includes. */
|
|
"
|
|
if test "x$ac_cv_header_linux_fanotify_h" = xyes; then :
|
|
$as_echo "#define HAVE_LINUX_FANOTIFY_H 1" >>confdefs.h
|
|
|
|
fi
|
|
|
|
|
|
|
|
# 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.
|
|
if test "$oldest_abi" != default && test "2.2.4" \< "$oldest_abi"; then
|
|
libc_cv_gcc_unwind_find_fde=no
|
|
fi
|
|
|
|
if test -n "$sysheaders"; then
|
|
CPPFLAGS=$OLD_CPPFLAGS
|
|
fi
|
|
|
|
# Under Linux the NPTL add-on should be available.
|
|
case $add_ons in
|
|
# It is available. Good.
|
|
*nptl*)
|
|
nptl_missing=
|
|
;;
|
|
*)
|
|
nptl_missing=yes
|
|
;;
|
|
esac
|
|
|
|
if test "$nptl_missing"; then
|
|
if test $enable_sanity = yes; then
|
|
echo "\
|
|
*** On GNU/Linux systems it is normal to compile GNU libc with the
|
|
*** \`nptl' add-on. Without that, the library will be
|
|
*** incompatible with normal GNU/Linux systems.
|
|
*** If you really mean to not use this add-on, run configure again
|
|
*** using the extra parameter \`--disable-sanity-checks'."
|
|
exit 1
|
|
else
|
|
echo "\
|
|
*** WARNING: Are you sure you do not want to use the \`nptl'
|
|
*** add-on?"
|
|
fi
|
|
fi
|
|
|
|
if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then
|
|
if test $enable_sanity = yes; then
|
|
echo "\
|
|
*** On GNU/Linux systems the GNU C Library should not be installed into
|
|
*** /usr/local since this might make your system totally unusable.
|
|
*** We strongly advise to use a different prefix. For details read the FAQ.
|
|
*** If you really mean to do this, run configure again using the extra
|
|
*** parameter \`--disable-sanity-checks'."
|
|
exit 1
|
|
else
|
|
echo "\
|
|
*** WARNING: Do you really want to install the GNU C Library into /usr/local?
|
|
*** This might make your system totally unusable, for details read the FAQ."
|
|
fi
|
|
fi
|
|
|
|
|
|
# One Linux we use ldconfig.
|
|
use_ldconfig=yes
|
|
|
|
if test $host = $build; then
|
|
# If $prefix/include/{net,scsi} are symlinks, make install will
|
|
# clobber what they're linked to (probably a kernel tree).
|
|
# test -L ought to work on all Linux boxes.
|
|
if test "x$prefix" != xNONE; then
|
|
ac_prefix=$prefix
|
|
else
|
|
ac_prefix=$ac_default_prefix
|
|
fi
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for symlinks in ${ac_prefix}/include" >&5
|
|
$as_echo_n "checking for symlinks in ${ac_prefix}/include... " >&6; }
|
|
ac_message=
|
|
if test -L ${ac_prefix}/include/net; then
|
|
ac_message="$ac_message
|
|
${ac_prefix}/include/net is a symlink"
|
|
fi
|
|
if test -L ${ac_prefix}/include/scsi; then
|
|
ac_message="$ac_message
|
|
${ac_prefix}/include/scsi is a symlink"
|
|
fi
|
|
if test -n "$ac_message"; then
|
|
as_fn_error $? "$ac_message
|
|
\`make install' will destroy the target of the link(s).
|
|
Delete the links and re-run configure, or better still, move the entire
|
|
${ac_prefix}/include directory out of the way." "$LINENO" 5
|
|
else
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
|
|
$as_echo "ok" >&6; }
|
|
fi
|
|
fi
|
|
|
|
# We have inlined syscalls.
|
|
$as_echo "#define HAVE_INLINED_SYSCALLS 1" >>confdefs.h
|
|
|