|
From: Martin S. <ma...@ma...> - 2020-04-27 13:16:14
|
On Sat, 4 Apr 2020, Martin Storsjö wrote: > Don't assume that __MINGW32__ implies x86; Windows runs on ARM/ARM64 > as well, and there are mingw toolchains that target those architectures. > > This mirrors how the MSVC part of the same expressions are written, > as (defined(_WIN32) && defined(_M_IX86)) and > (defined(_WIN64) && defined(_M_X64)) - not relying on _WIN32/_WIN64 > or __MINGW32__/__MINGW64__ alone to indicate architecture. > --- > include/valgrind.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/valgrind.h b/include/valgrind.h > index c8b24a38e..e8195c1ce 100644 > --- a/include/valgrind.h > +++ b/include/valgrind.h > @@ -131,11 +131,11 @@ > # define PLAT_x86_darwin 1 > #elif defined(__APPLE__) && defined(__x86_64__) > # define PLAT_amd64_darwin 1 > -#elif (defined(__MINGW32__) && !defined(__MINGW64__)) \ > +#elif (defined(__MINGW32__) && defined(__i386__)) \ > || defined(__CYGWIN32__) \ > || (defined(_WIN32) && defined(_M_IX86)) > # define PLAT_x86_win32 1 > -#elif defined(__MINGW64__) \ > +#elif (defined(__MINGW64__) && defined(__x86_64__)) \ > || (defined(_WIN64) && defined(_M_X64)) > # define PLAT_amd64_win64 1 > #elif defined(__linux__) && defined(__i386__) > -- > 2.17.1 Ping, any comments on this? It's not directly related to valgrind functionality, but glib includes this header, and this header breaks compilation on non-x86 windows platforms in its current form. // Martin |