diff --git a/cmake/IntelDFP.cmake b/cmake/IntelDFP.cmake index d1e7c53be..e190e89da 100644 --- a/cmake/IntelDFP.cmake +++ b/cmake/IntelDFP.cmake @@ -11,7 +11,7 @@ set (INTEL_DFP_LIBRARY_URL_HASH "SHA256=ac157e69c05556f3fa468ab34caeb1114a3b88ae18241bd41cc57b85a02dd314" CACHE STRING "The hash of the archive that lives at INTEL_DFP_LIBRARY_URL (Spelled: =)") option (INTEL_DFP_LIBRARY_PATCH_ENABLED - "Whether to apply the s390x compatibility patch to the Intel DFP library" ON) + "Whether to apply patches to the Intel DFP library" ON) set (_hash_arg) if (NOT INTEL_DFP_LIBRARY_URL_SHA256 STREQUAL "no-verify") @@ -42,6 +42,7 @@ FetchContent_Declare ( -p 4 # Strip four path components "${PROJECT_SOURCE_DIR}/etc/mongo-inteldfp-s390x.patch" "${PROJECT_SOURCE_DIR}/etc/mongo-inteldfp-MONGOCRYPT-571.patch" + "${PROJECT_SOURCE_DIR}/etc/mongo-inteldfp-libmongocrypt-pr-625.patch" --verbose ) diff --git a/etc/mongo-inteldfp-libmongocrypt-pr-625.patch b/etc/mongo-inteldfp-libmongocrypt-pr-625.patch new file mode 100644 index 000000000..33fd9e50b --- /dev/null +++ b/etc/mongo-inteldfp-libmongocrypt-pr-625.patch @@ -0,0 +1,13 @@ +diff --git a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h +index ef8a5b7..98d86c1 100644 +--- a/src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h ++++ b/src/third_party/IntelRDFPMathLib20U1/LIBRARY/float128/architecture.h +@@ -39,7 +39,7 @@ + # define merced + #endif + +-#if defined(ct) || defined(efi2) ++#if defined(ct) || defined(efi2) || defined(__x86_64__) + # undef _M_AMD64 + # define _M_AMD64 + #endif