diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2008-08-17 10:19:34 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-08-17 10:19:34 +0000 |
| commit | 74745ec578126af6bb3f9d68bcfaab0ba9e6039d (patch) | |
| tree | 2b755621212e4b743c6980e6a4b886daa98e2964 /libstdc++-v3/acinclude.m4 | |
| parent | c8bbc9ef2a33fcf34118362e6361760f179d0908 (diff) | |
| download | gcc-74745ec578126af6bb3f9d68bcfaab0ba9e6039d.zip gcc-74745ec578126af6bb3f9d68bcfaab0ba9e6039d.tar.gz gcc-74745ec578126af6bb3f9d68bcfaab0ba9e6039d.tar.bz2 | |
acinclude.m4 ([GLIBCXX_CHECK_LFS], [...]): Use GCC_TRY_COMPILE_OR_LINK instead of AC_TRY_LINK...
2008-08-17 Paolo Carlini <paolo.carlini@oracle.com>
* acinclude.m4 ([GLIBCXX_CHECK_LFS], [GLIBCXX_CHECK_POLL],
[GLIBCXX_CHECK_S_ISREG_OR_S_IFREG], [GLIBCXX_CHECK_WRITEV]):
Use GCC_TRY_COMPILE_OR_LINK instead of AC_TRY_LINK, in C++,
with -fno-exceptions as flags.
* configure.ac: Run unconditionally GLIBCXX_CHECK_LFS,
GLIBCXX_CHECK_POLL, GLIBCXX_CHECK_S_ISREG_OR_S_IFREG,
GLIBCXX_CHECK_WRITEV and commonized AC_CHECK_HEADERS.
* crossconfig.m4: Adjust; remove AC_CHECK_HEADERS commonized
in configure.ac.
* configure: Regenerate.
From-SVN: r139168
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 5c98ebd..3c3bcfb 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -390,9 +390,15 @@ dnl Check whether S_ISREG (Posix) or S_IFREG is available in <sys/stat.h>. dnl Define HAVE_S_ISREG / HAVE_S_IFREG appropriately. dnl AC_DEFUN([GLIBCXX_CHECK_S_ISREG_OR_S_IFREG], [ + + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fno-exceptions" + AC_MSG_CHECKING([for S_ISREG or S_IFREG]) AC_CACHE_VAL(glibcxx_cv_S_ISREG, [ - AC_TRY_LINK( + GCC_TRY_COMPILE_OR_LINK( [#include <sys/stat.h>], [struct stat buffer; fstat(0, &buffer); @@ -401,7 +407,7 @@ AC_DEFUN([GLIBCXX_CHECK_S_ISREG_OR_S_IFREG], [ [glibcxx_cv_S_ISREG=no]) ]) AC_CACHE_VAL(glibcxx_cv_S_IFREG, [ - AC_TRY_LINK( + GCC_TRY_COMPILE_OR_LINK( [#include <sys/stat.h>], [struct stat buffer; fstat(0, &buffer); @@ -420,6 +426,9 @@ AC_DEFUN([GLIBCXX_CHECK_S_ISREG_OR_S_IFREG], [ res=S_IFREG fi AC_MSG_RESULT($res) + + CXXFLAGS="$ac_save_CXXFLAGS" + AC_LANG_RESTORE ]) @@ -427,9 +436,15 @@ dnl dnl Check whether poll is available in <poll.h>, and define HAVE_POLL. dnl AC_DEFUN([GLIBCXX_CHECK_POLL], [ + + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fno-exceptions" + AC_MSG_CHECKING([for poll]) AC_CACHE_VAL(glibcxx_cv_POLL, [ - AC_TRY_LINK( + GCC_TRY_COMPILE_OR_LINK( [#include <poll.h>], [struct pollfd pfd[1]; pfd[0].events = POLLIN; @@ -441,6 +456,9 @@ AC_DEFUN([GLIBCXX_CHECK_POLL], [ AC_DEFINE(HAVE_POLL, 1, [Define if poll is available in <poll.h>.]) fi AC_MSG_RESULT($glibcxx_cv_POLL) + + CXXFLAGS="$ac_save_CXXFLAGS" + AC_LANG_RESTORE ]) @@ -448,9 +466,15 @@ dnl dnl Check whether writev is available in <sys/uio.h>, and define HAVE_WRITEV. dnl AC_DEFUN([GLIBCXX_CHECK_WRITEV], [ + + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -fno-exceptions" + AC_MSG_CHECKING([for writev]) AC_CACHE_VAL(glibcxx_cv_WRITEV, [ - AC_TRY_LINK( + GCC_TRY_COMPILE_OR_LINK( [#include <sys/uio.h>], [struct iovec iov[2]; writev(0, iov, 0);], @@ -461,6 +485,9 @@ AC_DEFUN([GLIBCXX_CHECK_WRITEV], [ AC_DEFINE(HAVE_WRITEV, 1, [Define if writev is available in <sys/uio.h>.]) fi AC_MSG_RESULT($glibcxx_cv_WRITEV) + + CXXFLAGS="$ac_save_CXXFLAGS" + AC_LANG_RESTORE ]) @@ -531,7 +558,7 @@ AC_DEFUN([GLIBCXX_CHECK_LFS], [ CXXFLAGS="$CXXFLAGS -fno-exceptions" AC_MSG_CHECKING([for LFS support]) AC_CACHE_VAL(glibcxx_cv_LFS, [ - AC_TRY_LINK( + GCC_TRY_COMPILE_OR_LINK( [#include <unistd.h> #include <stdio.h> #include <sys/stat.h> |