forked from Imagelibrary/binutils-gdb
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
This commit is contained in:
12
gdb/configure
vendored
12
gdb/configure
vendored
@@ -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 ()
|
||||
|
||||
12
gdbserver/configure
vendored
12
gdbserver/configure
vendored
@@ -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 ()
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
12
gdbsupport/configure
vendored
12
gdbsupport/configure
vendored
@@ -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 ()
|
||||
|
||||
Reference in New Issue
Block a user