summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2013-06-25 15:53:03 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-26 17:17:23 +0200
commitca1ac7634f00b845ded92b5fabfa0d1c53197b01 (patch)
tree5c9bac8addacbdd696c4a5255976449cf3496940
parent7d469e82e274d334c7d03d81b10d225c59d30798 (diff)
downloadqtjsbackend-ca1ac7634f00b845ded92b5fabfa0d1c53197b01.tar.gz
[V8] Fix stack alignment corruption for MinGW32 buildv5.1.0-rc2v5.1.0
BUG: https://bugreports.qt-project.org/browse/QTBUG-31396 Change-Id: If9b236f24ed82f4b6b19a2af938b422c68e5eab8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> (cherry picked from commit 91f936a862644c7ca7a1762ad05cc91d263b808e) Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Liang Qi <liang.qi@digia.com>
-rw-r--r--src/3rdparty/v8/src/platform-win32.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/v8/src/platform-win32.cc b/src/3rdparty/v8/src/platform-win32.cc
index 76e35f5..ae9ab2a 100644
--- a/src/3rdparty/v8/src/platform-win32.cc
+++ b/src/3rdparty/v8/src/platform-win32.cc
@@ -1523,9 +1523,12 @@ double OS::nan_value() {
int OS::ActivationFrameAlignment() {
#ifdef _WIN64
return 16; // Windows 64-bit ABI requires the stack to be 16-byte aligned.
-#else
- return 8; // Floating-point math runs faster with 8-byte alignment.
+#elif defined(__MINGW32__)
+ // With gcc 4.4 the tree vectorization optimizer can generate code
+ // that requires 16 byte alignment such as movdqa on x86.
+ return 16;
#endif
+ return 8; // Floating-point math runs faster with 8-byte alignment.
}