public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Fix build issues with mingw toolchain
@ 2024-05-06 16:43 Bernd Edlinger
0 siblings, 0 replies; only message in thread
From: Bernd Edlinger @ 2024-05-06 16:43 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=45e83f865876e42d22cf4bc242725bb4a25a12e3
commit 45e83f865876e42d22cf4bc242725bb4a25a12e3
Author: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Mon May 6 07:07:07 2024 +0200
Fix build issues with mingw toolchain
With a x86_64-pc-mingw32 toolchain there is a build issue
whether or not the --disable-threading option is used.
The problem happens because _WIN32_WINNT is defined to 0x501
before #include <mutex> which makes the compilation abort
due to missing support for __gthread_cond_t in std_mutex.h,
which is conditional on _WIN32_WINNT >= 0x600.
Fix the case when --disable-threading is used, by only
including <mutex> in gdb/complaints.c when STD_CXX_THREAD
is defined.
Additionally make the configure script try to #include <mutex>
to automatically select --disable-threading when the header file
is not able to compile.
Approved-By: Tom Tromey <tom@tromey.com>
Diff:
---
gdb/complaints.c | 2 ++
gdb/configure | 1 +
gdbserver/configure | 1 +
gdbsupport/common.m4 | 1 +
gdbsupport/configure | 1 +
5 files changed, 6 insertions(+)
diff --git a/gdb/complaints.c b/gdb/complaints.c
index debafde794b..07c0f7e52e5 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -24,7 +24,9 @@
#include "top.h"
#include "gdbsupport/selftest.h"
#include <unordered_map>
+#if CXX_STD_THREAD
#include <mutex>
+#endif
/* Map format strings to counters. */
diff --git a/gdb/configure b/gdb/configure
index c3d5cf7ed63..98cd488a737 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -20854,6 +20854,7 @@ else
# endif
#endif /* __MINGW32__ || __CYGWIN__ */
#include <thread>
+ #include <mutex>
void callback() { }
int
main ()
diff --git a/gdbserver/configure b/gdbserver/configure
index 026d250cc73..2da525ebf3b 100755
--- a/gdbserver/configure
+++ b/gdbserver/configure
@@ -9561,6 +9561,7 @@ else
# endif
#endif /* __MINGW32__ || __CYGWIN__ */
#include <thread>
+ #include <mutex>
void callback() { }
int
main ()
diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4
index 240ec008f2a..bef396445ba 100644
--- a/gdbsupport/common.m4
+++ b/gdbsupport/common.m4
@@ -114,6 +114,7 @@ AC_DEFUN([GDB_AC_COMMON], [
# endif
#endif /* __MINGW32__ || __CYGWIN__ */
#include <thread>
+ #include <mutex>
void callback() { }]],
[[std::thread t(callback);]])],
gdb_cv_cxx_std_thread=yes,
diff --git a/gdbsupport/configure b/gdbsupport/configure
index ae991250ce4..a218b06ce28 100755
--- a/gdbsupport/configure
+++ b/gdbsupport/configure
@@ -12335,6 +12335,7 @@ else
# endif
#endif /* __MINGW32__ || __CYGWIN__ */
#include <thread>
+ #include <mutex>
void callback() { }
int
main ()
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-05-06 16:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-06 16:43 [binutils-gdb] Fix build issues with mingw toolchain Bernd Edlinger
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).