diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-12-12 17:44:08 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-12-12 17:44:08 +0000 |
| commit | dc5b4e214a381431ea60ce81e7b2727e3129c27b (patch) | |
| tree | da266dea433c194ed21b23dda0b61df498dc4f6b | |
| parent | 4f9d1920dfe883c0ed425703f5ede0fa7ffe9801 (diff) | |
| download | gcc-dc5b4e214a381431ea60ce81e7b2727e3129c27b.tar.gz | |
Fix configure test for sendfile()
Backport from mainline
2016-05-25 Jonathan Wakely <jwakely@redhat.com>
* acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Fix test for sendfile.
* configure: Regenerate.
* config.h.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@243569 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 4 | ||||
| -rw-r--r-- | libstdc++-v3/config.h.in | 2 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 4 |
4 files changed, 14 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 00a0c2d07c0..c81ee4dd312 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,15 @@ 2016-12-12 Jonathan Wakely <jwakely@redhat.com> Backport from mainline + 2016-05-25 Jonathan Wakely <jwakely@redhat.com> + + * acinclude.m4 (GLIBCXX_CHECK_FILESYSTEM_DEPS): Fix test for sendfile. + * configure: Regenerate. + * config.h.in: Regenerate. + +2016-12-12 Jonathan Wakely <jwakely@redhat.com> + + Backport from mainline 2016-12-07 Jonathan Wakely <jwakely@redhat.com> * testsuite/18_support/headers/new/synopsis.cc: Add C++14 declarations diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index c453145c55b..4b951d86c49 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -4433,7 +4433,7 @@ dnl gnu* | linux* | solaris*) GCC_TRY_COMPILE_OR_LINK( [#include <sys/sendfile.h>], - [sendfile(1, 2, (off_t*)NULL, sizeof 1);], + [sendfile(1, 2, (off_t*)0, sizeof 1);], [glibcxx_cv_sendfile=yes], [glibcxx_cv_sendfile=no]) ;; @@ -4443,7 +4443,7 @@ dnl esac ]) if test $glibcxx_cv_sendfile = yes; then - AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in <sys/stat.h>.]) + AC_DEFINE(_GLIBCXX_USE_SENDFILE, 1, [Define if sendfile is available in <sys/sendfile.h>.]) fi AC_MSG_RESULT($glibcxx_cv_sendfile) dnl diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in index 9a3afe57986..d3d40742a42 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in @@ -937,7 +937,7 @@ /* Define if _SC_NPROC_ONLN is available in <unistd.h>. */ #undef _GLIBCXX_USE_SC_NPROC_ONLN -/* Define if sendfile is available in <sys/stat.h>. */ +/* Define if sendfile is available in <sys/sendfile.h>. */ #undef _GLIBCXX_USE_SENDFILE /* Define if struct stat has timespec members. */ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index c1b9d02ab74..4b06793e1c4 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -80427,7 +80427,7 @@ else int main () { -sendfile(1, 2, (off_t*)NULL, sizeof 1); +sendfile(1, 2, (off_t*)0, sizeof 1); ; return 0; } @@ -80448,7 +80448,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -sendfile(1, 2, (off_t*)NULL, sizeof 1); +sendfile(1, 2, (off_t*)0, sizeof 1); ; return 0; } |