From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@adacore.com>
Subject: [PATCH] Set _WIN32_WINNT in common.m4 configure check
Date: Mon, 9 Jan 2023 07:47:16 -0700 [thread overview]
Message-ID: <20230109144716.1988567-1-tromey@adacore.com> (raw)
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
---
gdb/configure | 12 +++++++++++-
gdbserver/configure | 12 +++++++++++-
gdbsupport/common-defs.h | 4 +++-
gdbsupport/common.m4 | 13 ++++++++++++-
gdbsupport/configure | 12 +++++++++++-
5 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/gdb/configure b/gdb/configure
index 0591d187f0a..0455af120f3 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -24969,7 +24969,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 ()
diff --git a/gdbserver/configure b/gdbserver/configure
index e5e0cb14d03..e807c60c08a 100755
--- a/gdbserver/configure
+++ b/gdbserver/configure
@@ -7951,7 +7951,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 ()
diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h
index bcebd7187d9..5e529f6febf 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 c6b9a25b744..3909ec81ccb 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 a0e4a3f94a4..9433ac41468 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 ()
--
2.38.1
next reply other threads:[~2023-01-09 14:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 14:47 Tom Tromey [this message]
2023-01-09 15:27 ` Tom Tromey
2023-01-09 16:41 ` Eli Zaretskii
2023-01-11 17:30 ` Tom Tromey
2023-01-12 5:22 ` Joel Brobecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230109144716.1988567-1-tromey@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).