From 5a0352054f470c3f69edc1ae6b5e8a65f8af98e6 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 21 Aug 2014 14:36:36 +0200 Subject: [PATCH] Disable FMA3 optimizations on x64 http://connect.microsoft.com/VisualStudio/feedbackdetail/view/893171/c000001d-illegal-instruction-on-msvcr120-log-0x2d3-on-x64 Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum --- src/Changelog.txt | 1 + src/TortoiseProc/TortoiseProc.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/Changelog.txt b/src/Changelog.txt index 3fd51acb9..989ff19fd 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -3,6 +3,7 @@ Released: unreleased == Bug Fixes == * Fixed issue #2257: Fetching & pushing using ssh.exe not working with TortoiseGit 1.8.10 + * Fixed crashes while opening the revision graph in the x64 version on some AMD CPUs = Release 1.8.10.0 = Released: 2014-08-12 diff --git a/src/TortoiseProc/TortoiseProc.cpp b/src/TortoiseProc/TortoiseProc.cpp index 1ea4d33e5..9664cc7ef 100644 --- a/src/TortoiseProc/TortoiseProc.cpp +++ b/src/TortoiseProc/TortoiseProc.cpp @@ -40,6 +40,7 @@ #include "Libraries.h" #include "TaskbarUUID.h" #include "ProjectProperties.h" +#include #define STRUCT_IOVEC_DEFINED @@ -69,6 +70,9 @@ CTortoiseProcApp::CTortoiseProcApp() m_bSaveState = FALSE; retSuccess = false; m_gdiplusToken = NULL; +#if defined (_WIN64) && _MSC_VER >= 1800 + _set_FMA3_enable(0); +#endif } CTortoiseProcApp::~CTortoiseProcApp() -- 2.11.4.GIT