diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2024-05-06 07:07:07 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2024-05-06 18:44:54 +0200 |
| commit | 45e83f865876e42d22cf4bc242725bb4a25a12e3 (patch) | |
| tree | a89244942087d486543190ceb2a567145f58599e | |
| parent | 147fe7f9fb9a89b217d11d73053f53e8edacf90f (diff) | |
| download | binutils-45e83f865876e42d22cf4bc242725bb4a25a12e3.zip binutils-45e83f865876e42d22cf4bc242725bb4a25a12e3.tar.gz binutils-45e83f865876e42d22cf4bc242725bb4a25a12e3.tar.bz2 | |
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>
| -rw-r--r-- | gdb/complaints.c | 2 | ||||
| -rwxr-xr-x | gdb/configure | 1 | ||||
| -rwxr-xr-x | gdbserver/configure | 1 | ||||
| -rw-r--r-- | gdbsupport/common.m4 | 1 | ||||
| -rwxr-xr-x | gdbsupport/configure | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/gdb/complaints.c b/gdb/complaints.c index debafde..07c0f7e 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 c3d5cf7..98cd488 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 026d250..2da525e 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 240ec00..bef3964 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 ae99125..a218b06 100755 --- a/gdbsupport/configure +++ b/gdbsupport/configure @@ -12335,6 +12335,7 @@ else # endif #endif /* __MINGW32__ || __CYGWIN__ */ #include <thread> + #include <mutex> void callback() { } int main () |