aboutsummaryrefslogtreecommitdiff
path: root/gdbsupport
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2023-01-09 07:43:29 -0700
committerTom Tromey <tromey@adacore.com>2023-01-11 11:00:42 -0700
commit2124b2de4bba05063218501dcccfc4cffe648cda (patch)
tree9116666e35c82145dc05d45936b19e27eb070719 /gdbsupport
parent1b9af5b949bff0c750ededb459400c1857fec416 (diff)
downloadgdb-2124b2de4bba05063218501dcccfc4cffe648cda.zip
gdb-2124b2de4bba05063218501dcccfc4cffe648cda.tar.gz
gdb-2124b2de4bba05063218501dcccfc4cffe648cda.tar.bz2
Set _WIN32_WINNT in common.m4 configure check
GCC recently added support for the Windows thread model, enabling libstdc++ to support Windows natively. However, this supporrt requires a version of Windows later than the minimum version that is supported by GDB. PR build/29966 points out that the GDB configure test for std::thread does not work in this situation, because _WIN32_WINNT is not defined in test program, and so <thread> seems to be fine. This patch is an attempt to fix the problem, by using the same setting for _WIN32_WINNT at configure time as is used at build time. I don't have access to one of the older systems so I don't think I can truly test this. I did do a mingw cross build, though. I'm going to ask the bug reporter to test it. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29966
Diffstat (limited to 'gdbsupport')
-rw-r--r--gdbsupport/common-defs.h4
-rw-r--r--gdbsupport/common.m413
-rwxr-xr-xgdbsupport/configure12
3 files changed, 26 insertions, 3 deletions
diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h
index bcebd71..5e529f6 100644
--- a/gdbsupport/common-defs.h
+++ b/gdbsupport/common-defs.h
@@ -70,7 +70,9 @@
/* We don't support Windows versions before XP, so we define
_WIN32_WINNT correspondingly to ensure the Windows API headers
- expose the required symbols. */
+ expose the required symbols.
+
+ NOTE: this must be kept in sync with common.m4. */
#if defined (__MINGW32__) || defined (__CYGWIN__)
# ifdef _WIN32_WINNT
# if _WIN32_WINNT < 0x0501
diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4
index c6b9a25..3909ec8 100644
--- a/gdbsupport/common.m4
+++ b/gdbsupport/common.m4
@@ -100,7 +100,18 @@ AC_DEFUN([GDB_AC_COMMON], [
AC_CACHE_CHECK([for std::thread],
gdb_cv_cxx_std_thread,
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
- [[#include <thread>
+ dnl NOTE: this must be kept in sync with common-defs.h.
+ [[#if defined (__MINGW32__) || defined (__CYGWIN__)
+ # ifdef _WIN32_WINNT
+ # if _WIN32_WINNT < 0x0501
+ # undef _WIN32_WINNT
+ # define _WIN32_WINNT 0x0501
+ # endif
+ # else
+ # define _WIN32_WINNT 0x0501
+ # endif
+ #endif /* __MINGW32__ || __CYGWIN__ */
+ #include <thread>
void callback() { }]],
[[std::thread t(callback);]])],
gdb_cv_cxx_std_thread=yes,
diff --git a/gdbsupport/configure b/gdbsupport/configure
index a0e4a3f..9433ac4 100755
--- a/gdbsupport/configure
+++ b/gdbsupport/configure
@@ -8967,7 +8967,17 @@ if ${gdb_cv_cxx_std_thread+:} false; then :
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <thread>
+ #if defined (__MINGW32__) || defined (__CYGWIN__)
+ # ifdef _WIN32_WINNT
+ # if _WIN32_WINNT < 0x0501
+ # undef _WIN32_WINNT
+ # define _WIN32_WINNT 0x0501
+ # endif
+ # else
+ # define _WIN32_WINNT 0x0501
+ # endif
+ #endif /* __MINGW32__ || __CYGWIN__ */
+ #include <thread>
void callback() { }
int
main ()