summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-27 12:59:32 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-27 12:59:33 +0200
commita2868f5b240da01cf2cc46aef6958bad2f403cea (patch)
treef7dad6d066cd278a3064b27efc2d0723e5dae3ea
parentc3d1413b64d599b5dc156ff6a1112ef65bf041d7 (diff)
parent91f936a862644c7ca7a1762ad05cc91d263b808e (diff)
Merge remote-tracking branch 'origin/stable' into dev
-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 1022e50..6c06d7e 100644
--- a/src/3rdparty/v8/src/platform-win32.cc
+++ b/src/3rdparty/v8/src/platform-win32.cc
@@ -1544,9 +1544,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.
}