From 3dde4d658b231673bd2d61dddd4708ab4ff66b49 Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Tue, 26 Jan 2016 16:34:24 +0000 Subject: [PATCH] configure.ac (ac_cv_std_swap_in_utility): New test. * configure.ac (ac_cv_std_swap_in_utility): New test. * system.h (): Check HAVE_SWAP_IN_UTILITY as well. * configure: Regenerate. * config.in: Regenerate. From-SVN: r232836 --- gcc/ChangeLog | 19 +++++++++++++------ gcc/config.in | 9 ++++++++- gcc/configure | 38 ++++++++++++++++++++++++++++++++++++-- gcc/configure.ac | 9 +++++++++ gcc/system.h | 2 +- 5 files changed, 67 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6518a3b18413..71e96024dd4f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,11 +1,18 @@ +2016-01-26 Michael Matz + + * configure.ac (ac_cv_std_swap_in_utility): New test. + * system.h (): Check HAVE_SWAP_IN_UTILITY as well. + * configure: Regenerate. + * config.in: Regenerate. + 2016-01-26 Claudiu Zissulescu - * config/arc/arc.md (cstoresi4): Force operand into register. - (arcset): Fix predicate. - (arcsetltu): Likewise. - (arcsetgeu): Likewise. - (arcsethi): Likewise. - (arcsetls): Likewise. + * config/arc/arc.md (cstoresi4): Force operand into register. + (arcset): Fix predicate. + (arcsetltu): Likewise. + (arcsetgeu): Likewise. + (arcsethi): Likewise. + (arcsetls): Likewise. 2016-01-26 Jakub Jelinek diff --git a/gcc/config.in b/gcc/config.in index 1796e1d895e3..115cb61639da 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -1705,6 +1705,12 @@ #endif +/* Define if defines std::swap. */ +#ifndef USED_FOR_TARGET +#undef HAVE_SWAP_IN_UTILITY +#endif + + /* Define to 1 if you have the `sysconf' function. */ #ifndef USED_FOR_TARGET #undef HAVE_SYSCONF @@ -1865,7 +1871,8 @@ #endif -/* Define if your assembler supports .dwsect 0xB0000 */ +/* Define if your assembler supports AIX debug frame section label reference. + */ #ifndef USED_FOR_TARGET #undef HAVE_XCOFF_DWARF_EXTRAS #endif diff --git a/gcc/configure b/gcc/configure index ff646e8fcac2..8ea4281cce42 100755 --- a/gcc/configure +++ b/gcc/configure @@ -6534,6 +6534,40 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::swap in " >&5 +$as_echo_n "checking for std::swap in ... " >&6; } +if test "${ac_cv_std_swap_in_utility+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include + +int +main () +{ +int a, b; std::swap(a,b); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_std_swap_in_utility=yes +else + ac_cv_std_swap_in_utility=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_std_swap_in_utility" >&5 +$as_echo "$ac_cv_std_swap_in_utility" >&6; } +if test $ac_cv_std_swap_in_utility = yes; then + +$as_echo "#define HAVE_SWAP_IN_UTILITY 1" >>confdefs.h + +fi + # Check whether compiler is affected by placement new aliasing bug (PR 29286). # If the host compiler is affected by the bug, and we build with optimization # enabled (which happens e.g. when cross-compiling), the pool allocator may @@ -18419,7 +18453,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18422 "configure" +#line 18456 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18525,7 +18559,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18528 "configure" +#line 18562 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 4dc7c109a266..6cfb68a8520a 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -416,6 +416,15 @@ struct X { typedef long long t; }; ]], [[X::t x;]])],[],[AC_MSG_ERROR([error verifying int64_t uses long long])]) fi +AC_CACHE_CHECK(for std::swap in , ac_cv_std_swap_in_utility, [ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include +]], [[int a, b; std::swap(a,b);]])],[ac_cv_std_swap_in_utility=yes],[ac_cv_std_swap_in_utility=no])]) +if test $ac_cv_std_swap_in_utility = yes; then + AC_DEFINE(HAVE_SWAP_IN_UTILITY, 1, + [Define if defines std::swap.]) +fi + # Check whether compiler is affected by placement new aliasing bug (PR 29286). # If the host compiler is affected by the bug, and we build with optimization # enabled (which happens e.g. when cross-compiling), the pool allocator may diff --git a/gcc/system.h b/gcc/system.h index 8151e0a7b2a3..445073c5cae7 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -217,7 +217,7 @@ extern int errno; #endif #ifdef __cplusplus -#ifdef INCLUDE_ALGORITHM +#if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY) # include #endif # include