diff options
| -rwxr-xr-x | gdb/configure | 19 | ||||
| -rwxr-xr-x | gdbserver/configure | 19 | ||||
| -rw-r--r-- | gdbsupport/common.m4 | 31 | ||||
| -rwxr-xr-x | gdbsupport/configure | 19 |
4 files changed, 42 insertions, 46 deletions
diff --git a/gdb/configure b/gdb/configure index 7ae8a2a..7225c7f 100755 --- a/gdb/configure +++ b/gdb/configure @@ -14668,12 +14668,11 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - if test "$threads" = "yes"; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$PTHREAD_CFLAGS $save_CXXFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::thread" >&5 + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$PTHREAD_CFLAGS $save_CXXFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::thread" >&5 $as_echo_n "checking for std::thread... " >&6; } if ${gdb_cv_cxx_std_thread+:} false; then : $as_echo_n "(cached) " >&6 @@ -14681,7 +14680,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <thread> - void callback() { } + void callback() { } int main () { @@ -14700,6 +14699,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_cxx_std_thread" >&5 $as_echo "$gdb_cv_cxx_std_thread" >&6; } + if test "$threads" = "yes"; then # This check must be here, while LIBS includes any necessary # threading library. for ac_func in pthread_sigmask pthread_setname_np @@ -14714,10 +14714,9 @@ _ACEOF fi done - - LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" fi + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" if test "$want_threading" = "yes"; then if test "$gdb_cv_cxx_std_thread" = "yes"; then diff --git a/gdbserver/configure b/gdbserver/configure index bcb1594..e6b46c2 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -7930,12 +7930,11 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - if test "$threads" = "yes"; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$PTHREAD_CFLAGS $save_CXXFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::thread" >&5 + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$PTHREAD_CFLAGS $save_CXXFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::thread" >&5 $as_echo_n "checking for std::thread... " >&6; } if ${gdb_cv_cxx_std_thread+:} false; then : $as_echo_n "(cached) " >&6 @@ -7943,7 +7942,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <thread> - void callback() { } + void callback() { } int main () { @@ -7962,6 +7961,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_cxx_std_thread" >&5 $as_echo "$gdb_cv_cxx_std_thread" >&6; } + if test "$threads" = "yes"; then # This check must be here, while LIBS includes any necessary # threading library. for ac_func in pthread_sigmask pthread_setname_np @@ -7976,10 +7976,9 @@ _ACEOF fi done - - LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" fi + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" if test "$want_threading" = "yes"; then if test "$gdb_cv_cxx_std_thread" = "yes"; then diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 index 838c01c..d3e9ecb 100644 --- a/gdbsupport/common.m4 +++ b/gdbsupport/common.m4 @@ -93,27 +93,26 @@ AC_DEFUN([GDB_AC_COMMON], [ # mingw and DJGPP. AC_LANG_PUSH([C++]) AX_PTHREAD([threads=yes], [threads=no]) - if test "$threads" = "yes"; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$PTHREAD_CFLAGS $save_CXXFLAGS" - AC_CACHE_CHECK([for std::thread], - gdb_cv_cxx_std_thread, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - [[#include <thread> - void callback() { }]], - [[std::thread t(callback);]])], - gdb_cv_cxx_std_thread=yes, - gdb_cv_cxx_std_thread=no)]) + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$PTHREAD_CFLAGS $save_CXXFLAGS" + AC_CACHE_CHECK([for std::thread], + gdb_cv_cxx_std_thread, + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[#include <thread> + void callback() { }]], + [[std::thread t(callback);]])], + gdb_cv_cxx_std_thread=yes, + gdb_cv_cxx_std_thread=no)]) + if test "$threads" = "yes"; then # This check must be here, while LIBS includes any necessary # threading library. AC_CHECK_FUNCS([pthread_sigmask pthread_setname_np]) - - LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" fi + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" if test "$want_threading" = "yes"; then if test "$gdb_cv_cxx_std_thread" = "yes"; then diff --git a/gdbsupport/configure b/gdbsupport/configure index 2070a39..618f487 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -8945,12 +8945,11 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - if test "$threads" = "yes"; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$PTHREAD_CFLAGS $save_CXXFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::thread" >&5 + save_LIBS="$LIBS" + LIBS="$PTHREAD_LIBS $LIBS" + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$PTHREAD_CFLAGS $save_CXXFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::thread" >&5 $as_echo_n "checking for std::thread... " >&6; } if ${gdb_cv_cxx_std_thread+:} false; then : $as_echo_n "(cached) " >&6 @@ -8958,7 +8957,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <thread> - void callback() { } + void callback() { } int main () { @@ -8977,6 +8976,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_cxx_std_thread" >&5 $as_echo "$gdb_cv_cxx_std_thread" >&6; } + if test "$threads" = "yes"; then # This check must be here, while LIBS includes any necessary # threading library. for ac_func in pthread_sigmask pthread_setname_np @@ -8991,10 +8991,9 @@ _ACEOF fi done - - LIBS="$save_LIBS" - CXXFLAGS="$save_CXXFLAGS" fi + LIBS="$save_LIBS" + CXXFLAGS="$save_CXXFLAGS" if test "$want_threading" = "yes"; then if test "$gdb_cv_cxx_std_thread" = "yes"; then |