desktop/source/app/sofficemain.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 638e149eb6740bfec22cec9f0511e1471a99bb5a
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Wed Jun 15 22:32:44 2016 +0200
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.mohrh...@googlemail.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit 4f32fcf59854fe1abe375c8702cc5c4258abbf3d)
Reviewed-on: https://gerrit.libreoffice.org/26342
diff --git a/desktop/source/app/sofficemain.cxx
b/desktop/source/app/sofficemain.cxx
index 755da59..146c580 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
