vcpkg/ports/boost-multiprecision/0001-Fix-selection-logic-in-intel_intrinsics.hpp.patch

30 lines
1.3 KiB
Diff
Raw Normal View History

[boost] update to 1.78.0 (#21928) * [scripts] update scripts * [boost-*] generate ports * update versions * [scripts] update boost version in boost-modular-headers.cmake * [scripts] add post source stubs for boost-json and boost-nowide ports and re-generate Boost ports * update versions * [boost-asio] make OpenSSL optional #20718 * update versions * [boost] [boost-mpi] [boost-python] disable python for iOS and Android, fixes #21474 * update versions * [boost-fiber] add NUMA support, fixes #16507 * update version * [boost-build] apply patch https://github.com/bfgroup/b2/pull/113 for fix build boost-fiber and boost-stacktrace * update version * [boost-atomic] fix compilation for uwp * update version * ignore mapnik's fail on arm64-windows * [boost-python] support ARM on Windows * update versions * Boost features testing within CI * [boost-modular-build-helper] fix boost_python file name in Jamroot.jam * [boost-mpi] fix build with python2 or python3 * update versions * [boost-fiber] fix build with numa=on * update version * [boost-multiprecision] fix build with MSVC on ARM * update version * [boost-mpi] try to fix build on linux and osx * update versions * exclude static * guarantee the same result across platforms * minor changes to boost-modular-build-helper's CMake * correct versions * [boost-modular-build-helper] install Python extensions on Windows * [boost-mpi] add patch to fix build Python extension on Windows * update versions * [boost-mpi] remove python2 by request @BillyONeal @strega-nil-ms * update version * update versions Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2022-01-11 03:47:12 +08:00
From e1ae1e4dc3d450e47693f3b190520b598f88fc60 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Sat, 18 Dec 2021 16:58:47 +0000
Subject: [PATCH] Fix selection logic in intel_intrinsics.hpp To correctly
exclude msvc+arm. Fixes https://github.com/boostorg/multiprecision/issues/405
---
include/boost/multiprecision/cpp_int/intel_intrinsics.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
index fcfacef1..eb4624bb 100644
--- a/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
+++ b/include/boost/multiprecision/cpp_int/intel_intrinsics.hpp
@@ -31,9 +31,9 @@
#undef BOOST_MP_HAS_IMMINTRIN_H
#endif
-#if defined(BOOST_MSVC) && !defined(_M_IX86) && !defined(_M_ARM64) && !defined(_M_X64)
+#if defined(BOOST_MSVC) && !defined(_M_IX86) && !defined(_M_X64) && !defined(_M_AMD64)
//
-// When targeting platforms such as ARM, msvc still has the INtel headers in it's include path
+// When targeting platforms such as ARM, msvc still has the Intel headers in it's include path
// even though they're not usable. See https://github.com/boostorg/multiprecision/issues/321
//
#undef BOOST_MP_HAS_IMMINTRIN_H
--
2.34.1.windows.1