diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-13 12:33:55 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-13 12:56:17 (GMT) |
commit | 38d92bd2511ed56d7a7eece20a370e818fb8d05c (patch) | |
tree | 2980ba84dfbd5a68d3c95589221afb3fbda1a248 /configure | |
parent | 171c8b3dd904d3adf26d00ebaa0f372c1a8a5c71 (diff) | |
download | Qt-38d92bd2511ed56d7a7eece20a370e818fb8d05c.zip Qt-38d92bd2511ed56d7a7eece20a370e818fb8d05c.tar.gz Qt-38d92bd2511ed56d7a7eece20a370e818fb8d05c.tar.bz2 |
Disable the JavaScriptCore JIT in ICC.
As of ICC 12.0.2, ICC is known to miscompile some "fastcall" code,
which causes runtime crashes. This fault has been reported to Intel
and a fix is being prepared.
Reviewed-by: Olivier Goffart
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -6750,8 +6750,15 @@ if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" if [ $? != "0" ]; then CFG_JAVASCRIPTCORE_JIT=no fi - elif [ "$XPLATFORM" = "symbian-gcce" ]; then - CFG_JAVASCRIPTCORE_JIT=no + else + case "$XPLATFORM" in + symbian-gcce) + CFG_JAVASCRIPTCORE_JIT=no + ;; + linux-icc*) + CFG_JAVASCRIPTCORE_JIT=no + ;; + esac fi fi @@ -8585,7 +8592,7 @@ case "$CFG_WEBKIT" in debug) echo "WebKit module .......... yes (debug)" ;; no) echo "WebKit module .......... no" ;; esac -if [ "$CFG_WEBKIT" != "no" ]; then +if [ "$CFG_WEBKIT" != "no" ] || [ "$CFG_SCRIPT" != "no" ]; then if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then echo "JavaScriptCore JIT ..... To be decided by JavaScriptCore" else |