summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-10-11 16:34:44 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-18 20:49:18 +0200
commiteadfdbbf0c2f20dbd2df7832df64f4a1ef67acb7 (patch)
treee22184c40e09e15596f86ee2752c4378f56d9304 /mkspecs
parent1d96a970b8f834efbb64d597966aad18677aa0a5 (diff)
downloadqt4-tools-eadfdbbf0c2f20dbd2df7832df64f4a1ef67acb7.tar.gz
Remove the -falign-stack option from ICC's mkspec.
This option was necessary in early ICC 12 releases because of a difference in interpreting the ABI requirements with GCC. According to ICC devs, GCC changed the ABI on its own to require 16-byte-aligned stacks on i386. It looks like this option has been the default in later ICC 12 releases. At least 12.1 update 5 has it by default. ICC 13 does not have the option anymore but accepts it silently for backwards compatibility. (cherry-picked from qt5 change 76874dea4449029856a7a1f639b995a9e35c6166) Change-Id: Id8bb4c250718eef2f02dc97bd47a0efd95b272fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/linux-icc/qmake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 38916ece5c..f7d7e0bba6 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -21,7 +21,7 @@ QMAKE_LEX = flex
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
QMAKE_YACCFLAGS = -d
-QMAKE_CFLAGS = -falign-stack=maintain-16-byte
+QMAKE_CFLAGS =
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -w1 -Wcheck -wd654,1572,411,873,1125,2259
QMAKE_CFLAGS_WARN_OFF = -w