diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/Dist | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 35 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/timebits.h | 8 |
4 files changed, 39 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/Dist b/sysdeps/unix/sysv/linux/alpha/Dist index d79f1f2970..d898d041a2 100644 --- a/sysdeps/unix/sysv/linux/alpha/Dist +++ b/sysdeps/unix/sysv/linux/alpha/Dist @@ -4,4 +4,3 @@ ioperm.c init-first.h clone.S sys/io.h -llseek.S diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 867d4fbe7a..6f3d181f9d 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -1,16 +1,43 @@ -; then + # Local configure fragment for sysdeps/unix/sysv/linux. + +# On Linux, the default is to use libio instead of stdio. +test $stdio = default && stdio=libio + +# We also use the new malloc by default. +test $malloc = default && malloc=new-malloc + +# Don't bother trying to generate any glue code to be compatible with the +# existing system library, because we are the only system library. +inhibit_glue=yes + +echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6 +echo "configure:15: checking installed Linux kernel header files" >&5 +if eval "test \"`echo '$''{'libc_cv_linux2010'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 20 "configure" +#include "confdefs.h" +#include <linux/version.h> +int main() { +#if LINUX_VERSION_CODE < ( *65536+ 0 *256+ 10) /* .0.10 */ +eat flaming death +#endif +; return 0; } +EOF +if { (eval echo configure:29: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_linux2010='2.0.10 or later' else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.$ac_ext >&AC_FD_CC + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* libc_cv_linux2010='TOO OLD!' fi rm -f conftest* fi -echo "$ac_t""$libc_cv_linux2010" 1>&AC_FD_MSG +echo "$ac_t""$libc_cv_linux2010" 1>&6 if test "$libc_cv_linux2010" != '2.0.10 or later'; then { echo "configure: error: GNU libc requires kernel header files from Linux 2.0.10 or later to be installed before configuring. diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index b6474a940c..fe499af438 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -5,6 +5,9 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # On Linux, the default is to use libio instead of stdio. test $stdio = default && stdio=libio +# We also use the new malloc by default. +test $malloc = default && malloc=new-malloc + # Don't bother trying to generate any glue code to be compatible with the # existing system library, because we are the only system library. inhibit_glue=yes diff --git a/sysdeps/unix/sysv/linux/timebits.h b/sysdeps/unix/sysv/linux/timebits.h index 8aed9e94df..c31f481a60 100644 --- a/sysdeps/unix/sysv/linux/timebits.h +++ b/sysdeps/unix/sysv/linux/timebits.h @@ -33,9 +33,11 @@ struct timeval #ifndef _TIMEBITS_H -#define _TIMEBITS_H 1 +# define _TIMEBITS_H 1 -#include <asm/param.h> -#define CLOCKS_PER_SEC HZ /* XXX names not kosher */ +# ifdef __USE_MISC +# include <asm/param.h> +# define CLOCKS_PER_SEC HZ /* XXX names not kosher */ +# endif #endif /* timebits.h */ |