summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-06-15 22:32:44 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-06-16 00:49:04 +0000
commit638e149eb6740bfec22cec9f0511e1471a99bb5a (patch)
tree8c9a717549cdc43b47d527790adbeceeb6732859 /desktop
parent51034e90af7e7da683598724f9aba90953a67fa5 (diff)
work around MSVCR2013 bug around AVX, tdf#99410
http://crashreport.libreoffice.org/stats/crash_details/d7bc6c8a-e8c2-4c1f-8291-ccab84ea892c Change-Id: I76f9614bc54988c001c9b252707e4b5d4c588112 Reviewed-on: https://gerrit.libreoffice.org/26339 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 4f32fcf59854fe1abe375c8702cc5c4258abbf3d) Reviewed-on: https://gerrit.libreoffice.org/26342
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/sofficemain.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 755da5920e09..146c5804f47b 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -107,6 +107,12 @@ static bool dumpCallback(const wchar_t* path, const wchar_t* id,
#endif
extern "C" int DESKTOP_DLLPUBLIC soffice_main()
{
+#if defined(_WIN64) && _MSC_VER <= 1800
+ // tdf#99410: MSVC 2013 runtime library has problems with some math functions if
+ // the CPU supports them and they are disabled in the OS
+ _set_FMA3_enable(0);
+#endif
+
#if HAVE_FEATURE_BREAKPAD
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID