diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 42 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.ac | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tst-fanotify.c | 14 |
5 files changed, 8 insertions, 65 deletions
@@ -1,5 +1,13 @@ 2016-02-24 Joseph Myers <joseph@codesourcery.com> + * sysdeps/unix/sysv/linux/configure.ac (linux/fanotify.h): Do not + test for header. + * sysdeps/unix/sysv/linux/configure: Regenerated. + * config.h.in (HAVE_LINUX_FANOTIFY_H): Remove #undef. + * sysdeps/unix/sysv/linux/tst-fanotify.c [!HAVE_LINUX_FANOTIFY_H]: + Remove conditional code. + [HAVE_LINUX_FANOTIFY_H]: Make code unconditional. + * sysdeps/unix/sysv/linux/configure.ac (LIBC_LINUX_VERSION): Define to 3.2.0. (arch_minimum_kernel): Likewise. diff --git a/config.h.in b/config.h.in index 13c0044a69..0147ba3c34 100644 --- a/config.h.in +++ b/config.h.in @@ -164,9 +164,6 @@ /* Define to 1 if STT_GNU_IFUNC support actually works. */ #define HAVE_IFUNC 0 -/* Define if linux/fanotify.h is available. */ -#undef HAVE_LINUX_FANOTIFY_H - /* Define if the linker defines __ehdr_start. */ #undef HAVE_EHDR_START diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index ab96601f0c..cace758c01 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -1,34 +1,3 @@ - -# 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. @@ -137,17 +106,6 @@ else *** 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 - - - if test -n "$sysheaders"; then CPPFLAGS=$OLD_CPPFLAGS fi diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac index b3e74bd2e2..13abda0a51 100644 --- a/sysdeps/unix/sysv/linux/configure.ac +++ b/sysdeps/unix/sysv/linux/configure.ac @@ -65,12 +65,6 @@ else *** compatible kernel version]) fi -# Until we start requiring 2.6.37+ headers, we need to check for the -# availability of linux/fanotify.h for testing purposes. -AC_CHECK_HEADER(linux/fanotify.h, - [AC_DEFINE(HAVE_LINUX_FANOTIFY_H)], , - [/* No default includes. */]) - if test -n "$sysheaders"; then CPPFLAGS=$OLD_CPPFLAGS fi diff --git a/sysdeps/unix/sysv/linux/tst-fanotify.c b/sysdeps/unix/sysv/linux/tst-fanotify.c index 8e8c10bf47..ed3a95176a 100644 --- a/sysdeps/unix/sysv/linux/tst-fanotify.c +++ b/sysdeps/unix/sysv/linux/tst-fanotify.c @@ -20,18 +20,6 @@ #include <errno.h> #include <fcntl.h> #include <stdio.h> - -#ifndef HAVE_LINUX_FANOTIFY_H - -static int -do_test (void) -{ - puts ("SKIP: missing support for fanotify due to old kernel headers"); - return 0; -} - -#else - #include <sys/fanotify.h> static int @@ -69,7 +57,5 @@ do_test (void) return 0; } -#endif - #define TEST_FUNCTION do_test () #include "../test-skeleton.c" |